summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Fischer <vlooe@web.de>2009-06-01 02:59:46 +0200
committerFlorian Fischer <vlooe@web.de>2009-06-01 02:59:46 +0200
commitf3e11a1cbc1b64d5780d931e81346f1571b75797 (patch)
tree263284d5873eb7fc328633b8dca03f53f83e1a7c /media-libs
parentsynced media-libs/openjpeg with main tree (diff)
downloadmultilib-portage-f3e11a1cbc1b64d5780d931e81346f1571b75797.tar.gz
multilib-portage-f3e11a1cbc1b64d5780d931e81346f1571b75797.tar.bz2
multilib-portage-f3e11a1cbc1b64d5780d931e81346f1571b75797.zip
added missing patches of media-libs/openjpeg
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/openjpeg/Manifest2
-rw-r--r--media-libs/openjpeg/files/openjpeg-1.3-darwin.patch41
-rw-r--r--media-libs/openjpeg/files/openjpeg-1.3-freebsd.patch20
3 files changed, 63 insertions, 0 deletions
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 783f9c166..ba014895c 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -2,6 +2,8 @@ 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_3.tar.gz 1004678 RMD160 2a22cc123058b1974cd1bf3898044acabceba26c SHA1 8d6870d9500ea09e0b1d30b981bea1c8de534de4 SHA256 3bca2e1e040f9dcbbcb1e0627f17a76eeb95e153bf663d082070c044a21202bd
EBUILD openjpeg-1.3-r1.ebuild 1331 RMD160 ff2ca5651ef14301bf927ff617939f7bfb650ee6 SHA1 c663f1581148b9b1373151085ab4058ee846fbce SHA256 a4252f19d0cbafcdc1fecf5ea52c7b21e9c9bd5213f434f6267328268572e452
EBUILD openjpeg-1.3-r2.ebuild 1454 RMD160 34fc9f8437647ffa56c61cf8415fb23e7f06c018 SHA1 67cb1e1322db80d9ef953cfc868cfff8acfb4589 SHA256 656f4de4f33fa4417072154c78a02e9d787b4efe4d97b389a3c4511a4af1708b
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 000000000..7115ebadc
--- /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 000000000..5dbe02ca8
--- /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 */