Hello community, here is the log from the commit of package openjpeg for openSUSE:Factory checked in at 2012-02-29 14:09:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openjpeg (Old) and /work/SRC/openSUSE:Factory/.openjpeg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openjpeg", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/openjpeg/openjpeg.changes 2011-12-07 21:41:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openjpeg.new/openjpeg.changes 2012-02-29 14:09:26.000000000 +0100 @@ -1,0 +2,48 @@ +Mon Feb 27 21:44:42 UTC 2012 - [email protected] + +- Update to version 1.5.0: + New Features: + * openjpip: + + complete client-server architecture for remote browsing of jpeg 2000 + images. + + see corresponding README for more details. + API modifications: + * 'bool' type has been replaced by 'opj_bool' type. 'stdbool.h' is no more + required. + Misc: + * improved cmake and autotools build methods. + * removed manual makefiles, VS project files and XCode project files. + * added a 'thirdparty' directory to contain all dependencies. + + These libraries will be build only if there are not found on the system. + + Note that libopenjpeg itself does not have any dependency. + * changed the directory hierarchy of the whole project. See README files for + details. + * tests : a complete test suite has been setup. + + both JPEG 2000 conformance tests and non-regressions tests are + configured. + + results are submitted to the OpenJPEG dashboard + (http://my.cdash.org/index.php?project=OPENJPEG) + + images are located in 'http://openjpeg.googlecode.com/svn/data' folder. + + configuration files and utilities are located in 'tests' folder. + * OPJViewer re-activated (need wxWidgets) + * Huge amount of bug fixes. See CHANGES for details. +- Removed the following patches (fixed upstream): + * fix_no_undefined.patch + * fix_soversion.patch + * install_pkgconfig_file.patch +- Replaced openjpeg-1.4-OpenJPEGConfig.patch with + openjpeg-1.5.0-cmake_Config.patch (taken from Fedora) +- Replaced openjpeg-1.4-cmake_symlink_fix.patch with + openjpeg-1.5.0-cmake_header_symlink.patch (taken from Fedora) +- Added 2 patches (taken from Fedora): + * openjpeg-1.5.0-cmake_libdir.patch -- Fix installation directories + * openjpeg-1.5.0-pkgconfig_includedir.patch -- Fix includedir in pkgconfig + file +- Spec file updates: + * Added doxygen in BuildRequires: to enable compilation of devel docs. + * Updated BuildRequires: to include also liblcms2-devel and zlib-devel. + * Fixed rpmlint warning "file-contains-date-and-time" +- No need to remove the JavaOpenJPEG/ directory from the package source anymore + (the Sun proprietary code was removed from the package). + +------------------------------------------------------------------- Old: ---- fix_no_undefined.patch fix_soversion.patch install_pkgconfig_file.patch openjpeg-1.4-OpenJPEGConfig.patch openjpeg-1.4-cmake_symlink_fix.patch openjpeg_v1_4_sources_r697-crippled.tar.bz2 openjpeg_v1_4_sources_r697-crippled.txt New: ---- openjpeg-1.5.0-cmake_Config.patch openjpeg-1.5.0-cmake_header_symlink.patch openjpeg-1.5.0-cmake_libdir.patch openjpeg-1.5.0-pkgconfig_includedir.patch openjpeg-1.5.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openjpeg.spec ++++++ --- /var/tmp/diff_new_pack.kFo2vj/_old 2012-02-29 14:09:27.000000000 +0100 +++ /var/tmp/diff_new_pack.kFo2vj/_new 2012-02-29 14:09:27.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package openjpeg # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,30 +16,28 @@ # - Name: openjpeg -Version: 1.4 +Version: 1.5.0 Release: 0 -License: BSD-2-Clause Summary: An open-source JPEG 2000 codec -Url: http://www.openjpeg.org/ +License: BSD-2-Clause Group: Productivity/Graphics/Other -# http://code.google.com/p/openjpeg/downloads/detail?name=openjpeg_v1_4_sources_r697.tgz -Source0: %{name}_v1_4_sources_r697-crippled.tar.bz2 -Source1: %{name}_v1_4_sources_r697-crippled.txt -# PATCH-FIX-OPENSUSE openjpeg-1.4-OpenJPEGConfig.patch rh#669425 [email protected] -- Fix OpenJPEGConfig.cmake (taken from Fedora) -Patch0: openjpeg-1.4-OpenJPEGConfig.patch -# PATCH-FIX-UPSTREAM openjpeg-1.4-cmake_symlink_fix.patch [email protected] -- Fix cmake create_symlink usage for header file (taken from Fedora) -Patch1: openjpeg-1.4-cmake_symlink_fix.patch -# PATCH-FIX-UPSTREAM fix_no_undefined.patch rh#467661 [email protected] -- Fix libopenjpeg undefined references (taken from upstream) -Patch2: fix_no_undefined.patch -# PATCH-FIX-UPSTREAM fix_soversion.patch [email protected] -- Fix so version to 1 instead of 1.4 (taken from upstream) -Patch3: fix_soversion.patch -# PATCH-FIX-UPSTREAM install_pkgconfig_file.patch [email protected] -- Fix cmake to install pkgconfig file(s) (taken from upstream) -Patch4: install_pkgconfig_file.patch +Url: http://www.openjpeg.org/ +Source0: http://openjpeg.googlecode.com/files/%{name}-%{version}.tar.gz +# PATCH-FIX-OPENSUSE openjpeg-1.5.0-cmake_Config.patch rh#669425 [email protected] -- Fix OpenJPEGConfig.cmake (taken from Fedora) +Patch0: openjpeg-1.5.0-cmake_Config.patch +# PATCH-FIX-OPENSUSE openjpeg-1.5.0-cmake_header_symlink.patch [email protected] -- Fix cmake create_symlink usage for header file (taken from Fedora) +Patch1: openjpeg-1.5.0-cmake_header_symlink.patch +# PATCH-FIX-OPENSUSE openjpeg-1.5.0-cmake_libdir.patch [email protected] -- Fix installation directories (taken from Fedora) +Patch2: openjpeg-1.5.0-cmake_libdir.patch +# PATCH-FIX-UPSTREAM openjpeg-1.5.0-pkgconfig_includedir.patch [email protected] -- Fix includedir in pkgconfig file (taken from Fedora) +Patch3: openjpeg-1.5.0-pkgconfig_includedir.patch BuildRequires: cmake +BuildRequires: doxygen +BuildRequires: liblcms2-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel +BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -66,14 +64,14 @@ compression standard from the Joint Photographic Experts Group (JPEG). %prep -%setup -q -n %{name}_v1_4_sources_r697 +%setup -q %patch0 -p1 %patch1 -p1 -%patch2 -%patch3 -%patch4 -# Make sure we use system libraries -rm -rf libs/ +%patch2 -p1 +%patch3 -p1 + +# Remove build time references so build-compare can do its work +sed -i "s/HTML_TIMESTAMP = YES/HTML_TIMESTAMP = NO/g" doc/Doxyfile.dox.cmake.in %build mkdir build @@ -86,7 +84,10 @@ -DOPENJPEG_INSTALL_LIB_DIR=%{_libdir} \ -DOPENJPEG_INSTALL_DATA_DIR=%{_datadir} \ -DOPENJPEG_INSTALL_INCLUDE_DIR=%{_includedir} \ - -DOPENJPEG_INSTALL_DOC_DIR=%{_docdir}/%{name} .. + -DOPENJPEG_INSTALL_DOC_DIR=%{_docdir}/%{name} \ + -DBUILD_SHARED_LIBS=ON \ + -DBUILD_DOC=ON \ + -DBUILD_THIRDPARTY=OFF .. make %{?_smp_mflags} VERBOSE=1 cd .. @@ -96,7 +97,7 @@ cd .. # Compatibility symlink -ln -s openjpeg-1.4 %{buildroot}%{_includedir}/openjpeg +ln -s openjpeg-1.5 %{buildroot}%{_includedir}/openjpeg %post -n libopenjpeg1 -p /sbin/ldconfig @@ -104,7 +105,7 @@ %files %defattr(-,root,root,-) -%doc CHANGES LICENSE README +%doc AUTHORS CHANGES LICENSE NEWS README THANKS %{_bindir}/image_to_j2k %{_bindir}/j2k_dump %{_bindir}/j2k_to_image @@ -114,12 +115,13 @@ %files devel %defattr(-,root,root,-) -%{_includedir}/openjpeg-1.4/ +%doc build/doc/html/ +%{_includedir}/openjpeg-1.5/ %{_includedir}/openjpeg/ %{_includedir}/openjpeg.h %{_libdir}/pkgconfig/libopenjpeg.pc %{_libdir}/pkgconfig/libopenjpeg1.pc -%{_libdir}/openjpeg-1.4/ +%{_libdir}/openjpeg-1.5/ %{_libdir}/libopenjpeg.so %{_mandir}/man3/libopenjpeg.3%{ext_man} ++++++ openjpeg-1.5.0-cmake_Config.patch ++++++ diff -up openjpeg-1.5.0/CMake/OpenJPEGConfig.cmake.in.cmake_Config openjpeg-1.5.0/CMake/OpenJPEGConfig.cmake.in --- openjpeg-1.5.0/CMake/OpenJPEGConfig.cmake.in.cmake_Config 2012-02-07 04:49:55.000000000 -0600 +++ openjpeg-1.5.0/CMake/OpenJPEGConfig.cmake.in 2012-02-09 15:14:50.673012792 -0600 @@ -11,13 +11,13 @@ SET(OPENJPEG_MINOR_VERSION "@OPENJPEG_VE SET(OPENJPEG_BUILD_VERSION "@OPENJPEG_VERSION_BUILD@") # The libraries. -SET(OPENJPEG_LIBRARIES "@OPENJPEG_LIBRARIES@") +SET(OPENJPEG_LIBRARIES "@OPENJPEG_LIBRARY_NAME@") # The CMake macros dir. -SET(OPENJPEG_CMAKE_DIR "@OPENJPEG_CMAKE_DIR_CONFIG@") +SET(OPENJPEG_CMAKE_DIR "@OPENJPEG_INSTALL_PACKAGE_DIR@") # The configuration options. -SET(OPENJPEG_BUILD_SHARED_LIBS "@OPENJPEG_BUILD_SHARED_LIBS@") +SET(OPENJPEG_BUILD_SHARED_LIBS "@BUILD_SHARED_LIBS@") # The "use" file. SET(OPENJPEG_USE_FILE "@OPENJPEG_USE_FILE_CONFIG@") ++++++ openjpeg-1.5.0-cmake_header_symlink.patch ++++++ diff -up openjpeg-1.5.0/libopenjpeg/CMakeLists.txt.header_symlink openjpeg-1.5.0/libopenjpeg/CMakeLists.txt --- openjpeg-1.5.0/libopenjpeg/CMakeLists.txt.header_symlink 2012-02-07 04:49:55.000000000 -0600 +++ openjpeg-1.5.0/libopenjpeg/CMakeLists.txt 2012-02-09 15:02:09.760525453 -0600 @@ -57,6 +57,10 @@ INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME} INSTALL(FILES openjpeg.h DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers ) +INSTALL( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink + \"${OPENJPEG_INSTALL_SUBDIR}/openjpeg.h\" + \"\$ENV{DESTDIR}${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg.h\")" +) # install man page of the library INSTALL( ++++++ openjpeg-1.5.0-cmake_libdir.patch ++++++ diff -up openjpeg-1.5.0/CMakeLists.txt.pkgconfig openjpeg-1.5.0/CMakeLists.txt --- openjpeg-1.5.0/CMakeLists.txt.pkgconfig 2012-02-07 04:49:55.000000000 -0600 +++ openjpeg-1.5.0/CMakeLists.txt 2012-02-09 14:11:50.695269015 -0600 @@ -107,7 +107,7 @@ IF(NOT OPENJPEG_INSTALL_DOC_DIR) ENDIF(NOT OPENJPEG_INSTALL_DOC_DIR) IF(NOT OPENJPEG_INSTALL_PACKAGE_DIR) - SET(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}") + SET(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}") ENDIF(NOT OPENJPEG_INSTALL_PACKAGE_DIR) #----------------------------------------------------------------------------- @@ -146,7 +146,7 @@ IF(UNIX) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libopenjpeg1.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc @ONLY) INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc DESTINATION - ${OPENJPEG_INSTALL_SHARE_DIR}/pkgconfig ) + ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) INSTALL( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libopenjpeg1.pc\" \"\$ENV{DESTDIR}${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig/libopenjpeg.pc\")") ++++++ openjpeg-1.5.0-pkgconfig_includedir.patch ++++++ diff -up openjpeg-1.5.0/libopenjpeg1.pc.cmake.pkgconfig_includedir openjpeg-1.5.0/libopenjpeg1.pc.cmake --- openjpeg-1.5.0/libopenjpeg1.pc.cmake.pkgconfig_includedir 2012-02-07 04:49:55.000000000 -0600 +++ openjpeg-1.5.0/libopenjpeg1.pc.cmake 2012-02-23 08:13:37.085488921 -0600 @@ -2,7 +2,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ bindir=@OPENJPEG_INSTALL_BIN_DIR@ datadir=@OPENJPEG_INSTALL_DATA_DIR@ libdir=@OPENJPEG_INSTALL_LIB_DIR@ -includedir=@OPENJPEG_INSTALL_INCLUDE_DIR@ +includedir=@OPENJPEG_INSTALL_INCLUDE_DIR@/@OPENJPEG_INSTALL_SUBDIR@ Name: openjpeg Description: JPEG2000 files library diff -up openjpeg-1.5.0/libopenjpeg1.pc.in.pkgconfig_includedir openjpeg-1.5.0/libopenjpeg1.pc.in --- openjpeg-1.5.0/libopenjpeg1.pc.in.pkgconfig_includedir 2012-02-07 04:49:55.000000000 -0600 +++ openjpeg-1.5.0/libopenjpeg1.pc.in 2012-02-23 08:16:11.822605414 -0600 @@ -1,7 +1,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -includedir=@includedir@ +includedir=@includedir@/openjpeg-@MAJOR_NR@.@MINOR_NR@ Name: openjpeg Description: JPEG2000 library -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
