From 1fbee9e7227ffd684500cde92ef83e80f0d8eb2e Mon Sep 17 00:00:00 2001 From: onekk Date: Tue, 25 Nov 2014 10:35:36 +0100 Subject: [PATCH 1/3] openjpeg: update to 1.5.2 and modified template file to use the new cmake build of the package. --- common/shlibs | 2 ++ srcpkgs/openjpeg/template | 23 +++++++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/common/shlibs b/common/shlibs index 82ab77a6b33..245f5884598 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1826,3 +1826,5 @@ libenventor.so.0 enventor-0.4.1_1 libCDApplet.so cairo-dock-plugins-3.4.0_1 libhydrogen-core-0.9.6.1.so hydrogen-0.9.6.1_1 libldns.so.1 libldns-1.6.17_1 +libopenjpeg.so.5 libopenjpeg-1.5.2_1 + diff --git a/srcpkgs/openjpeg/template b/srcpkgs/openjpeg/template index 7710923c994..f39c16f3d96 100644 --- a/srcpkgs/openjpeg/template +++ b/srcpkgs/openjpeg/template @@ -1,27 +1,27 @@ # Template file for 'openjpeg' pkgname=openjpeg -version=1.5.1 -revision=2 -build_style=gnu-configure +version=1.5.2 +revision=1 +build_style=cmake maintainer="Carlo Dormeletti " homepage="http://www.openjpeg.org/" license="BSD" -short_desc="Open-source JPEG 2000 codec written in C language" +short_desc="Open-source JPEG 2000 codec written in C language - version 1.5.x" configure_args="--disable-static" -hostmakedepends="pkg-config" +hostmakedepends="cmake pkg-config" makedepends="libpng-devel lcms2-devel tiff-devel doxygen" -distfiles="http://openjpeg.googlecode.com/files/${pkgname}-${version}.tar.gz" -checksum="6cfb3097a1c8e9550131b17663daf927f42707bc3f84196c1390642e87f3ab8d" +distfiles="$SOURCEFORGE_SITE/openjpeg.mirror/${version}/${pkgname}-${version}.tar.gz" +checksum="15df7b194a5d8dba0052cd21c17a4dc761149a770a907d73fffb972078c28a87" update_ignore="2.*" libopenjpeg-devel_package() { short_desc+=" - development files" depends="libopenjpeg>=${version}_${revision}" pkg_install() { - vmove usr/include - vmove "usr/lib/*.so" - vmove usr/lib/pkgconfig - vmove usr/share/man/man3 + vmove usr/include + vmove "usr/lib/*.so" + vmove usr/lib/pkgconfig + vmove usr/share/man/man3 } } @@ -29,6 +29,5 @@ libopenjpeg_package() { short_desc+=" - library files" pkg_install() { vmove "usr/lib/*.so.*" - } } From 0715365fb5de3ed5ff460b215f6ff1066b5f4c3f Mon Sep 17 00:00:00 2001 From: onekk Date: Wed, 26 Nov 2014 13:06:21 +0100 Subject: [PATCH 2/3] darktable: modified template to adpat at the libopenjpeg SONAME bump --- common/shlibs | 1 - srcpkgs/darktable/template | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index 245f5884598..db18845147b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1564,7 +1564,6 @@ libshiboken-python2.7.so.1.2 python-shiboken-1.2.2_1 libpyside-python2.7.so.1.2 python-pyside-1.2.2_1 libupsclient.so.4 libnetwork-ups-tools-2.7.2_1 libnutclient.so.0 libnetwork-ups-tools-2.7.2_1 -libopenjpeg.so.1 libopenjpeg-1.5.1_1 libsphinxad.so.0 sphinxbase-0.8_1 libsphinxbase.so.1 sphinxbase-0.8_1 libpocketsphinx.so.1 libpocketsphinx-0.8_3 diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template index eba65a2352c..13427a6f683 100644 --- a/srcpkgs/darktable/template +++ b/srcpkgs/darktable/template @@ -1,7 +1,7 @@ # Template file for 'darktable' pkgname=darktable version=1.4.2 -revision=11 +revision=12 build_style=cmake maintainer="Carlo Dormeletti " homepage="http://www.darktable.org/" @@ -12,8 +12,9 @@ hostmakedepends="cmake pkg-config intltool" makedepends="gtk+-devel glib-devel exiv2-devel lcms2-devel libglade-devel libxslt-devel dbus-glib-devel libcurl-devel libgphoto2-devel libwebp-devel libsoup-devel lensfun-devel sqlite-devel librsvg-devel - lua-devel json-glib-devel libgomp-devel colord-devel>=1.1.7 libopenjpeg-devel - libopenexr-devel>=2.2 libgraphicsmagick-devel SDL-devel" + lua-devel json-glib-devel libgomp-devel colord-devel>=1.1.7 + libopenjpeg-devel>=1.5.2 libopenexr-devel>=2.2 libgraphicsmagick-devel + SDL-devel" only_for_archs="i686 x86_64" # too much SSE2 stuff all over distfiles="${SOURCEFORGE_SITE}/${pkgname}/1.4/${pkgname}-${version}.tar.xz" From 38b17a032a81c37a29d9681dd29cf9879eab7685 Mon Sep 17 00:00:00 2001 From: onekk Date: Thu, 27 Nov 2014 12:17:28 +0100 Subject: [PATCH 3/3] openjepg: modified template file to eliminate versione desc. in short_desc --- srcpkgs/openjpeg/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openjpeg/template b/srcpkgs/openjpeg/template index f39c16f3d96..f687a0f4884 100644 --- a/srcpkgs/openjpeg/template +++ b/srcpkgs/openjpeg/template @@ -6,7 +6,7 @@ build_style=cmake maintainer="Carlo Dormeletti " homepage="http://www.openjpeg.org/" license="BSD" -short_desc="Open-source JPEG 2000 codec written in C language - version 1.5.x" +short_desc="Open-source JPEG 2000 codec written in C language" configure_args="--disable-static" hostmakedepends="cmake pkg-config" makedepends="libpng-devel lcms2-devel tiff-devel doxygen"