diff --git a/media-libs/openjpeg/openjpeg-2.1.0.recipe b/media-libs/openjpeg/openjpeg-2.1.1.recipe similarity index 83% rename from media-libs/openjpeg/openjpeg-2.1.0.recipe rename to media-libs/openjpeg/openjpeg-2.1.1.recipe index f6b95a921..f185dbe50 100644 --- a/media-libs/openjpeg/openjpeg-2.1.0.recipe +++ b/media-libs/openjpeg/openjpeg-2.1.1.recipe @@ -17,30 +17,32 @@ Universite catholique de Louvain (UCL), Belgium 2002-2003 Yannick Verschueren 2001-2003 David Janssens" LICENSE="BSD (2-clause)" -REVISION="2" -SOURCE_URI="http://sourceforge.net/projects/openjpeg.mirror/files/$portVersion/openjpeg-$portVersion.tar.gz" -CHECKSUM_SHA256="1232bb814fd88d8ed314c94f0bfebb03de8559583a33abbe8c64ef3fc0a8ff03" -PATCHES="openjpeg-2.1.0.patchset" +REVISION="1" +SOURCE_URI="http://github.com/uclouvain/openjpeg/archive/v$portVersion.tar.gz" +SOURCE_FILENAME="openjpeg-$portVersion.tar.gz" +CHECKSUM_SHA256="82c27f47fc7219e2ed5537ac69545bf15ed8c6ba8e6e1e529f89f7356506dbaa" +PATCHES="openjpeg-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" openjpeg$secondaryArchSuffix = $portVersion cmd:opj_decompress = $portVersion cmd:opj_compress = $portVersion cmd:opj_dump = $portVersion - lib:libopenjp2$secondaryArchSuffix = 7.0.0 compat >= 7 + lib:libopenjp2$secondaryArchSuffix = 7.0.1 compat >= 7 " REQUIRES=" haiku$secondaryArchSuffix - lib:libz$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libtiff$secondaryArchSuffix + lib:libz$secondaryArchSuffix " PROVIDES_devel=" openjpeg${secondaryArchSuffix}_devel = $portVersion - devel:libopenjp2$secondaryArchSuffix = 7.0.0 compat >= 7 + devel:libopenjp2$secondaryArchSuffix = 7.0.1 compat >= 7 " REQUIRES_devel=" openjpeg$secondaryArchSuffix == $portVersion @@ -48,11 +50,10 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libz$secondaryArchSuffix devel:libpng$secondaryArchSuffix devel:libtiff$secondaryArchSuffix + devel:libz$secondaryArchSuffix " -#needs devel:libtiff too but that isn't provided by anything BUILD_PREREQUIRES=" cmd:cmake cmd:make diff --git a/media-libs/openjpeg/patches/openjpeg-2.1.0.patchset b/media-libs/openjpeg/patches/openjpeg-2.1.1.patchset similarity index 86% rename from media-libs/openjpeg/patches/openjpeg-2.1.0.patchset rename to media-libs/openjpeg/patches/openjpeg-2.1.1.patchset index 7be500003..0bbd27d66 100644 --- a/media-libs/openjpeg/patches/openjpeg-2.1.0.patchset +++ b/media-libs/openjpeg/patches/openjpeg-2.1.1.patchset @@ -1,14 +1,14 @@ -From dcf06de5780b6e73ec5e1ff10a87ead0c265d41a Mon Sep 17 00:00:00 2001 +From 226171de9025bd6f855d3faab1e81b10ac5d194b Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 8 Oct 2014 21:27:56 +0200 Subject: Remove hardcoded libm. diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt -index 1c2ef39..33d8c32 100644 +index dc013c2..00860d1 100644 --- a/src/bin/jp2/CMakeLists.txt +++ b/src/bin/jp2/CMakeLists.txt -@@ -43,7 +43,7 @@ foreach(exe opj_decompress opj_compress opj_dump) +@@ -56,7 +56,7 @@ foreach(exe opj_decompress opj_compress opj_dump) # On unix you need to link to the math library: if(UNIX) @@ -18,7 +18,7 @@ index 1c2ef39..33d8c32 100644 # Install exe install(TARGETS ${exe} diff --git a/src/bin/jpip/CMakeLists.txt b/src/bin/jpip/CMakeLists.txt -index 821b201..ad39e5c 100644 +index 301d885..0b523c8 100644 --- a/src/bin/jpip/CMakeLists.txt +++ b/src/bin/jpip/CMakeLists.txt @@ -32,7 +32,7 @@ if(BUILD_JPIP_SERVER) @@ -44,23 +44,23 @@ index 5df225d..1cb52d2 100644 install(TARGETS ${jpwl_exe} diff --git a/src/bin/mj2/CMakeLists.txt b/src/bin/mj2/CMakeLists.txt -index 78ad754..4ad36fb 100644 +index 5d3e288..c75a7f1 100644 --- a/src/bin/mj2/CMakeLists.txt +++ b/src/bin/mj2/CMakeLists.txt @@ -39,7 +39,7 @@ foreach(exe target_link_libraries(${exe} ${LCMS_LIBNAME} openmj2) - + if(UNIX) - target_link_libraries(${exe} m) + target_link_libraries(${exe}) endif() - + install(TARGETS ${exe} diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt -index fcf60ec..1e1fab0 100644 +index 367a7a8..ca8d5d9 100644 --- a/src/lib/openjp2/CMakeLists.txt +++ b/src/lib/openjp2/CMakeLists.txt -@@ -51,7 +51,7 @@ if(WIN32) +@@ -83,7 +83,7 @@ if(WIN32) endif() add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS}) if(UNIX) @@ -68,8 +68,8 @@ index fcf60ec..1e1fab0 100644 + target_link_libraries(${OPENJPEG_LIBRARY_NAME}) endif() set_target_properties(${OPENJPEG_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES}) - -@@ -79,7 +79,7 @@ endif() + if(${CMAKE_VERSION} VERSION_GREATER "2.8.11") +@@ -114,7 +114,7 @@ endif() # no need to install: add_executable(t1_generate_luts t1_generate_luts.c) if(UNIX) @@ -79,7 +79,7 @@ index fcf60ec..1e1fab0 100644 # Experimental option; let's how cppcheck performs diff --git a/src/lib/openjp3d/CMakeLists.txt b/src/lib/openjp3d/CMakeLists.txt -index 8f034ff..2a4f9dc 100644 +index 26bf178..5ceb7f3 100644 --- a/src/lib/openjp3d/CMakeLists.txt +++ b/src/lib/openjp3d/CMakeLists.txt @@ -24,7 +24,7 @@ endif() @@ -90,9 +90,9 @@ index 8f034ff..2a4f9dc 100644 + target_link_libraries(${OPENJP3D_LIBRARY_NAME}) endif() set_target_properties(${OPENJP3D_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES}) - + if(${CMAKE_VERSION} VERSION_GREATER "2.8.11") diff --git a/src/lib/openjpwl/CMakeLists.txt b/src/lib/openjpwl/CMakeLists.txt -index 616edf5..d1c5704 100644 +index 9e2ace7..575cf3d 100644 --- a/src/lib/openjpwl/CMakeLists.txt +++ b/src/lib/openjpwl/CMakeLists.txt @@ -47,7 +47,7 @@ if(WIN32) @@ -105,7 +105,7 @@ index 616edf5..d1c5704 100644 set_target_properties(openjpwl PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES}) diff --git a/src/lib/openmj2/CMakeLists.txt b/src/lib/openmj2/CMakeLists.txt -index 775c931..53f558a 100644 +index 2ee1764..9217267 100644 --- a/src/lib/openmj2/CMakeLists.txt +++ b/src/lib/openmj2/CMakeLists.txt @@ -43,7 +43,7 @@ add_library(${OPENMJ2_LIBRARY_NAME} ${OPENMJ2_SRCS}) @@ -116,7 +116,7 @@ index 775c931..53f558a 100644 + target_link_libraries(${OPENMJ2_LIBRARY_NAME}) endif() set_target_properties(${OPENMJ2_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES}) - + if(${CMAKE_VERSION} VERSION_GREATER "2.8.11") -- -1.8.3.4 +2.2.2