diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2009-04-26 21:01:28 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2009-04-26 21:01:28 +0000 |
| commit | 2b3364694534754aefe03f47e446810a518c48f3 (patch) | |
| tree | e6d52c43242dd296a1ab0c332734130aa0955a9d /media-libs | |
| parent | Bump to 4.65, closes #249780. Based on the ebuild by jlec, incorporating chan... (diff) | |
| download | gentoo-2-2b3364694534754aefe03f47e446810a518c48f3.tar.gz gentoo-2-2b3364694534754aefe03f47e446810a518c48f3.tar.bz2 gentoo-2-2b3364694534754aefe03f47e446810a518c48f3.zip | |
Add compilation patches for FreeBSD and Darwin, fix bug #253012, thanks Dan Coats for the initial patch for FreeBSD
(Portage version: 2.1.6.7/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/openjpeg/ChangeLog | 8 | ||||
| -rw-r--r-- | media-libs/openjpeg/files/openjpeg-1.3-darwin.patch | 41 | ||||
| -rw-r--r-- | media-libs/openjpeg/files/openjpeg-1.3-freebsd.patch | 20 | ||||
| -rw-r--r-- | media-libs/openjpeg/openjpeg-1.3-r2.ebuild | 4 |
4 files changed, 71 insertions, 2 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/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() { |