Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=mcirstabumps.git;a=commitdiff;h=11e4c1807ef65577a1c23d9ab9309d1f70cc7caa
commit 11e4c1807ef65577a1c23d9ab9309d1f70cc7caa Author: Marius Cirsta <[email protected]> Date: Mon Feb 3 13:01:29 2014 +0200 openjpeg-2.0.0-3-x86_64 * fix for ffmpeg diff --git a/source/lib/openjpeg/FrugalBuild b/source/lib/openjpeg/FrugalBuild index e4cde59..403bdbf 100644 --- a/source/lib/openjpeg/FrugalBuild +++ b/source/lib/openjpeg/FrugalBuild @@ -5,20 +5,22 @@ options+=('asneeded') pkgname=openjpeg pkgver=2.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="An open-source JPEG 2000 codec written in C" Finclude googlecode cmake url="http://www.openjpeg.org/" depends=('libpng' 'libtiff' 'lcms2') groups=('lib') archs=('i686' 'x86_64') -source=(${source[@]} libopenjpeg2.pc) +source=(${source[@]} libopenjpeg2.pc openmj2_headers.patch) sha1sums=('0af78ab2283b43421458f80373422d8029a9f7a7' \ - 'a04064d5aada0bd8c0dd53c61ba7090f62340e79') -Fconfopts+=" --docdir=/usr/share/doc/openjpeg" + 'a04064d5aada0bd8c0dd53c61ba7090f62340e79' \ + 'ffa6c9b9b4eef5ba995ba2c3f2cc0ad81f143db6') +_F_cmake_confopts="-DBUILD_MJ2=1 -DOPENJPEG_INSTALL_DOC_DIR=/usr/share/doc/openjpeg" build() { CMake_build Fmkdir /usr/lib/pkgconfig Ffile libopenjpeg2.pc /usr/lib/pkgconfig/ + Fsed 'OPENJPEG_H' 'OPENMJ2_H' ${Fdestdir}/usr/include/openjpeg-2.0/openmj2.h } diff --git a/source/lib/openjpeg/openmj2_headers.patch b/source/lib/openjpeg/openmj2_headers.patch new file mode 100644 index 0000000..e3aaa28 --- /dev/null +++ b/source/lib/openjpeg/openmj2_headers.patch @@ -0,0 +1,15 @@ +--- openjpeg-2.0.0/src/lib/openmj2/CMakeLists.txt 2012-11-19 16:26:08.000000000 +0200 ++++ openjpeg-2.0.0.new/src/lib/openmj2/CMakeLists.txt 2014-02-03 11:49:32.781780557 +0200 +@@ -55,7 +55,8 @@ + ) + + # Install includes files +-#INSTALL(FILES mj2.h +-# DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${subdir} +-# COMPONENT Headers +-#) ++INSTALL(FILES openjpeg.h ++ DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} ++ COMPONENT Headers ++ RENAME openmj2.h ++) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
