Add compilation patches for FreeBSD and Darwin, fix bug #253012, thanks Dan Coats for the initial patch for FreeBSD

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

5 files changed, 75 insertions, 4 deletions

diff --git a/media-libs/openjpeg/ChangeLog b/media-libs/openjpeg/ChangeLog
index c9822afc4912..bade5462e49b 100644
--- a/media-libs/openjpeg/ChangeLog
+++ b/media-libs/openjpeg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/openjpeg
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.23 2009/04/13 19:59:54 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.24 2009/04/26 21:01:28 grobian Exp $
+
+  26 Apr 2009; Fabian Groffen <grobian@gentoo.org>
+  +files/openjpeg-1.3-darwin.patch, +files/openjpeg-1.3-freebsd.patch,
+  openjpeg-1.3-r2.ebuild:
+  Add compilation patches for FreeBSD and Darwin, fix bug #253012, thanks Dan
+  Coats for the initial patch for FreeBSD
 
   13 Apr 2009; Peter Alfredsen <loki_val@gentoo.org> metadata.xml:
   Drizzt retired, I'll take this.
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 4e57fade1f4d..866cea46aaa3 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -2,13 +2,15 @@ AUX openjpeg-1.1.1-Makefile.patch 558 RMD160 485ed66f0db6df3e657fa7fb09a333eae12
 AUX openjpeg-1.2-Makefile.patch 999 RMD160 0088fbadaea6401409071df76591ab6b1c006665 SHA1 79026cb2ea5fb9eafe187b03edad7f21e132a03b SHA256 39d427776b30026aa6ca03df4c52f13ffded210cb8327e351db1c9f170db5040
 AUX openjpeg-1.3-Makefile.patch 1560 RMD160 236c30638730961aae37d384484e8b7a32203558 SHA1 d69ad6fc4701506253f09b5b719c89e1b13e7773 SHA256 785b31521c4fa5e0b3c253d8b9cc8aacef0956b60a4c0d6aa82482c5899d4a68
 AUX openjpeg-1.3-codec-Makefile 722 RMD160 fdc0880dfab7f82d56716afb9b73a283953f0917 SHA1 b38ab6acda4676bba922167a06104f6c6564bdf2 SHA256 6554a08e1cd69476ad3c06cc6322ed28c010ac947a43489b14748c4e51d2a0a4
+AUX openjpeg-1.3-darwin.patch 1176 RMD160 b05ce81dfecfa41f15a4f70041a3fa04c70926cb SHA1 49b47307bc11334010c23082ccedc56fd8ba085d SHA256 f23683a40a73745ab1a1914ff75f4bd6da3aaccaeef088cf8c8a9ac6f6673a62
+AUX openjpeg-1.3-freebsd.patch 672 RMD160 b368524439bd11d3c68bc6e2b4aa129c08e7dd5a SHA1 8d51276c8d1ade2a7fe8ff76937d87c69daa7e51 SHA256 ea7113fbe3cdc2bc3d9199b266824be74f3556025a512c0cd2435797aa385809
 DIST openjpeg_v1_1_1.tar.gz 1406460 RMD160 08b2318441075a8704d6b9b0ac3d9d277c44d85e SHA1 1de6f9ccebe8844c96416daca521a20a84df23f5 SHA256 6076db131bfaa966a691d718044e5b5cdbec028436be3b7a3f146d1a0e3a7ec6
 DIST openjpeg_v1_2.tar.gz 929866 RMD160 3ac46e0f4cd16bbb52e05ad23e0b4d395c333c27 SHA1 38008abd77972b8062693254cb2ea087eb877ebd SHA256 20294c8aefc15b455abfc8ab73747ac5345a1cbf6f7035dd36ef690d2188e2c4
 DIST openjpeg_v1_3.tar.gz 1004678 RMD160 2a22cc123058b1974cd1bf3898044acabceba26c SHA1 8d6870d9500ea09e0b1d30b981bea1c8de534de4 SHA256 3bca2e1e040f9dcbbcb1e0627f17a76eeb95e153bf663d082070c044a21202bd
 EBUILD openjpeg-1.1.1.ebuild 915 RMD160 0b53488eafaa585dfc3943c14782b570cef9befc SHA1 7fc881f953de08433031e783eeb53792f56e6533 SHA256 6cc342323afcc39dc5bf9d7fcbebafa9ec850167380c30bd599c44e13035db9e
 EBUILD openjpeg-1.2.ebuild 875 RMD160 2d72394fb43dace4f56a7d12b9ec8140cc897dc2 SHA1 d6197ee13a04ad987690cd8b7245ab35a8c5a0ad SHA256 fa43faf3a01c8d797dfb62779a4d6e5f36de82d63591f859e8a8c6d116687321
 EBUILD openjpeg-1.3-r1.ebuild 1247 RMD160 73ebb61dee987e7d55c7b249b980df3404b167ba SHA1 926d84fa5117a62157f8092b97305e8d42413e63 SHA256 44693669257fc5e38ec5f5732f21c2c73e55160132bb1ec5c3433a96e20b7d49
-EBUILD openjpeg-1.3-r2.ebuild 1250 RMD160 47bf7446603c74c53e78d17ced5c76e9e919164e SHA1 08201d7856cef130a8f2badc46eedc1f4a6b2d47 SHA256 1d1b9bec34952ae4b482a31c95bd65379ed3a3d8bddc60e80c20e8e54b153b12
+EBUILD openjpeg-1.3-r2.ebuild 1374 RMD160 98c6bc48001ee2d6a138ffd9c1b5411e75ba5a0d SHA1 958f1711dfc32280f92cd6e890986fb63b0c80d9 SHA256 37fe781b9e178bca7a094564232e93c1ac38807761b599ad0e23cd00b64251ea
 EBUILD openjpeg-1.3.ebuild 1219 RMD160 5e7b3d3a7c6d589caf0817ba98400960e99b7afa SHA1 f31d8abaa4b7c6904da50d345ec61d5ebe5c44e7 SHA256 579e8185a32741b71355f8aa86252f714eee7fcc89f0640eb0a65f8fb7ecf080
-MISC ChangeLog 3393 RMD160 0051374d5b2759223207a993f4ebfa00a143fa4b SHA1 2fc9f0722295bfef975e6abd06380d863a9cbe0b SHA256 fa02d8aa585bf57803e2392fc8c54ea4225a9978457673b3565acef75b568923
+MISC ChangeLog 3661 RMD160 0538b050fbbce35844c0f899a4c5158fcbb94edd SHA1 630610db4759c8a620c3ed413fecb4db8024a381 SHA256 d4ae40a10aab743c1994bff4585787a0e4193a0145398a0c28382dd1503d5883
 MISC metadata.xml 326 RMD160 72b20347147595dd08cd3338a43bc98933fc771b SHA1 a44959d7c83dcf9ee3e1dc6f9fdf3263d4359262 SHA256 a14dd77590f690a8e3311ba9eb17a1b1f1aa72b2f82a8050997e8c01b5251891
diff --git a/media-libs/openjpeg/files/openjpeg-1.3-darwin.patch b/media-libs/openjpeg/files/openjpeg-1.3-darwin.patch
new file mode 100644
index 000000000000..7115ebadc38a
--- /dev/null
+++ b/media-libs/openjpeg/files/openjpeg-1.3-darwin.patch
@@ -0,0 +1,41 @@
+* <grobian@gentoo.org>: small compilation fix for Darwin, and produce
+                        correct(ly named) dylibs
+
+--- libopenjpeg/opj_malloc.h
++++ libopenjpeg/opj_malloc.h
+@@ -75,7 +75,7 @@
+ #else /* Not WIN32 */

+ 	#if defined(__sun)

+ 			#define HAVE_MEMALIGN

+-		#elif defined(__GNUC__)

++		#elif defined(__GNUC__) && !defined(__APPLE__)

+ 			#if defined(__FreeBSD__)

+ 			#include <stdlib.h>

+ 			#include <osreldate.h>

+--- Makefile
++++ Makefile
+@@ -26,8 +26,15 @@
+ 
+ TARGET  = openjpeg
+ STATICLIB = lib$(TARGET).a
++ifeq ($(TARGOS),Darwin)
++SHAREDLIB = lib$(TARGET).$(VER_MAJOR).$(VER_MINOR).dylib
++LIBNAME = lib$(TARGET).$(VER_MAJOR).dylib
++LIBCMD = -dynamiclib -install_name $(INSTALL_LIBDIR)/$(LIBNAME)
++else
+ SHAREDLIB = lib$(TARGET).so.$(VER_MAJOR).$(VER_MINOR)
+ LIBNAME = lib$(TARGET).so.$(VER_MAJOR)
++LIBCMD = -shared -Wl,-soname,$(LIBNAME)
++endif
+ 
+ 
+ 
+@@ -54,7 +61,7 @@
+ 	$(AR) r $@ $(MODULES)
+ 
+ $(SHAREDLIB): $(MODULES)
+-	$(CC) $(LDFLAGS) -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
++	$(CC) $(LDFLAGS) $(LIBCMD) -o $@ $(MODULES) $(LIBRARIES)
+ 
+ install: OpenJPEG
+ 	install -d '$(DESTDIR)$(INSTALL_LIBDIR)' '$(DESTDIR)$(INSTALL_INCLUDE)'
diff --git a/media-libs/openjpeg/files/openjpeg-1.3-freebsd.patch b/media-libs/openjpeg/files/openjpeg-1.3-freebsd.patch
new file mode 100644
index 000000000000..5dbe02ca8641
--- /dev/null
+++ b/media-libs/openjpeg/files/openjpeg-1.3-freebsd.patch
@@ -0,0 +1,20 @@
+http://www.freebsd.org/cgi/cvsweb.cgi/~checkout~/ports/graphics/openjpeg/files/patch-opj_malloc.h?rev=1.1;content-type=text%2Fplain
+
+patch modified not to contain a bogus empty #if block
+
+--- libopenjpeg/opj_malloc.h
++++ libopenjpeg/opj_malloc.h
+@@ -76,8 +76,13 @@
+ 	#if defined(__sun)

+ 			#define HAVE_MEMALIGN

+ 		#elif defined(__GNUC__)

++			#if defined(__FreeBSD__)

++			#include <stdlib.h>

++			#include <osreldate.h>

++			#else

+ 			#define HAVE_MEMALIGN

+ 			#include <malloc.h>		

++			#endif

+ 		/* Linux x86_64 and OSX always align allocations to 16 bytes */

+ 		#elif !defined(__amd64__) && !defined(__APPLE__)	

+ 			/* FIXME: Yes, this is a big assumption */

diff --git a/media-libs/openjpeg/openjpeg-1.3-r2.ebuild b/media-libs/openjpeg/openjpeg-1.3-r2.ebuild
index 44b0218b4161..31d37c445a81 100644
--- a/media-libs/openjpeg/openjpeg-1.3-r2.ebuild
+++ b/media-libs/openjpeg/openjpeg-1.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/openjpeg-1.3-r2.ebuild,v 1.1 2009/02/10 11:05:21 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/openjpeg-1.3-r2.ebuild,v 1.2 2009/04/26 21:01:28 grobian Exp $
 
 inherit eutils toolchain-funcs multilib
 
@@ -22,6 +22,8 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-Makefile.patch #258373
 	cp "${FILESDIR}"/${P}-codec-Makefile "${S}"/codec/Makefile
+	epatch "${FILESDIR}"/${P}-freebsd.patch #253012
+	epatch "${FILESDIR}"/${P}-darwin.patch # needs to go after freebsd patch
 }
 
 src_compile() {