Fix building with as-needed wrt bug 247919, debundle libquicktime, respect FLAGS, fix implicit function declarations.

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

5 files changed, 257 insertions, 3 deletions

diff --git a/media-video/xanim-export/ChangeLog b/media-video/xanim-export/ChangeLog
index 82d012267c4a..8c88f23be7a8 100644
--- a/media-video/xanim-export/ChangeLog
+++ b/media-video/xanim-export/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/xanim-export
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xanim-export/ChangeLog,v 1.15 2008/11/17 20:48:35 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/xanim-export/ChangeLog,v 1.16 2010/07/01 19:52:41 xarthisius Exp $
+
+*xanim-export-2.80.1-r5 (01 Jul 2010)
+
+  01 Jul 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  +files/2.80.1-gentoo.patch, +xanim-export-2.80.1-r5.ebuild,
+  +files/2.80.1-implicit_funcs.patch:
+  Fix building with as-needed wrt bug 247919, debundle libquicktime, respect
+  FLAGS, fix implicit function declarations.
 
   17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   files/2.80.1-makefile.patch:
diff --git a/media-video/xanim-export/Manifest b/media-video/xanim-export/Manifest
index c3f0e8fe35cc..9379a001be0c 100644
--- a/media-video/xanim-export/Manifest
+++ b/media-video/xanim-export/Manifest
@@ -1,3 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 2.80.1-gentoo.patch 2814 RMD160 74e39752b65f0d8a70c82e96374b4597a96e23e8 SHA1 3504da883c4ab85e6b88c6ff3edf493ae51976fb SHA256 20e5959f0105e048746795e4857ca7bdcecb2fc2754a4fce7e4bcbd96337877d
+AUX 2.80.1-implicit_funcs.patch 571 RMD160 97bfc112b12b5ab334464c775aff4ffb9c079835 SHA1 66272f17094b8550ecf940686329a9ce1f5ece45 SHA256 4f520f8d99150c6e8ce963aa41720f1dd3a702d5fccfa3a39f7d34155a8e0a7d
 AUX 2.80.1-makefile.patch 1028 RMD160 2a600043746d814948dd5fef8925c7f8ee0d60d7 SHA1 84d61217273c7c2dfad9c25ccc0cffc3d8e953cb SHA256 64522383a52a978384a8f40b81202906933ce38b0aeafb1a2e02e32332129f92
 DIST xa1.0_cyuv_linuxELFg21.o.gz 1141 RMD160 81ff86ccc99e72765da07c79708edfc496602235 SHA1 6d3c412bbd57be4f4afba550bd0f1b7287813b0e SHA256 9fa40166a40a20734ba1d00990d142a3961c2416e66dac3fe0767e8304aadb1a
 DIST xa1.0_cyuv_linuxPPC.o.Z 1513 RMD160 52a12b118d181a34754e79f11aec07b0bf202e48 SHA1 b9af24646b46d94ccfb5e042ca20f32006a8b0af SHA256 35318deacea099d0c05be985c01672f7f306e748965d5bbc8dd454fe8a28c46e
@@ -10,5 +15,15 @@ DIST xa2.0_iv32_sparcELF.o.Z 48813 RMD160 e4412117114a065d833e66fe0b04c64848ae60
 DIST xa2.1_iv32_linuxELFg21.o.gz 29291 RMD160 2b2cf2a47cb9d91abe5d4558cd375919e69b1cff SHA1 395ce9f94e0710d67c0200f7a609868ab0969062 SHA256 41420dca15e5e546c455553b6434435d53de17a08a6307a79de75e753a85b3a1
 DIST xanim_exporting_edition.tar.gz 985946 RMD160 6149f4f7397c52f64b15c58ef2e6a4247197026e SHA1 61dd8b396a782a33aa61c0af20eb6220aa0a527c SHA256 8e99b7ee3842fe6e4da43dc27f8c0584a66e6ef7168d30cd37cec64560207c33
 EBUILD xanim-export-2.80.1-r4.ebuild 3662 RMD160 56f61eaa8737e2eebed062d4ef925094afc4c706 SHA1 815ae8ba400841c0edecc43938f92bfba0d55e86 SHA256 5421439be63571d55fdd69f6d43d48b2c35152e9156cfd799770f215d034ea80
-MISC ChangeLog 2152 RMD160 35eaea17da18642031ea7e75955c0826905e08d2 SHA1 19c99168a962a62a33cd743404019ccd1f74c791 SHA256 fac7418788d1e18b751a2cec637bc2389922e43ce8639f55ab25bc5105bb8d6b
+EBUILD xanim-export-2.80.1-r5.ebuild 3126 RMD160 343a8e6ca232fb16f414a99d1fa6b13e0ab68d22 SHA1 f0e8a3d49a3855c4db0dcf9ef39b02a6fe1b8984 SHA256 0e0c16b2bdb223ade2658b97087bb45470231089041ef469bb931a4b2f9fe8b9
+MISC ChangeLog 2469 RMD160 0b784e37a26d81c6531d24a3dcf015cd098d709e SHA1 75947ad9c58cc16ab0d0b505d92f6a06615fb565 SHA256 740a3c3de95ce9cecbd2e9532441e0ba6c14a70cd5fe54550cdfadea673dc12e
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iJwEAQECAAYFAkws8hMACgkQIiMqcbOVdxRAFgP/dHfSCPZ1OCVEHkABnpgYR/AM
+nLyzgZcBdMKmGgRy+vxvfFMJUxahZsGxlRa3DYFWvX2XaEiuenwOPOcg6Nr2cVMB
+sN5xBqX46igoacg/YiK60A5GnFFR5bCekd3AvzsE5YTXocnzZkFTK1SHRKPN9GJQ
+5LdSvZFoT/ZDDKqvwnQ=
+=00Ay
+-----END PGP SIGNATURE-----
diff --git a/media-video/xanim-export/files/2.80.1-gentoo.patch b/media-video/xanim-export/files/2.80.1-gentoo.patch
new file mode 100644
index 000000000000..ffd0149a937e
--- /dev/null
+++ b/media-video/xanim-export/files/2.80.1-gentoo.patch
@@ -0,0 +1,88 @@
+Fixing as-needed issues, debundling libquicktime, respect FLAGS
+
+http://bugs.gentoo.org/show_bug.cgi?id=247919
+
+--- Makefile
++++ Makefile
+@@ -72,9 +72,6 @@
+ #         a setup problem on my SunOS machine.   Under Solaris, gcc worked
+ #         fine.
+ #
+-# CC = cc
+- CC = gcc
+-#CC = egcs
+ #
+ ######### OPTIMIZATION FLAGS
+ # -- Specifiy Any compiler Optimization flags that you wish to use. This
+@@ -116,7 +113,7 @@
+ #  to link against symbols inside xanim.
+ #
+ ### Linux
+-LD_FLAGS = -rdynamic
++LD_FLAGS = $(LDFLAGS) -rdynamic
+ ### SunOS/Solaris use:
+ # LD_FLAGS =
+ 
+@@ -133,7 +130,7 @@
+ #
+ XA_DLL_DEF = -DXA_DLL -DXA_PRINT
+ #### Use this only if the above doesn't work.
+-XA_DLL_DEF = -DXA_DLL
++#XA_DLL_DEF = -DXA_DLL
+ #
+ #### You may need this library.
+ XA_DLL_LIB = -ldl
+@@ -141,7 +138,7 @@
+ # If you'd like to change the default directory that XAnim searches while
+ # looking for dlls, then change the directory below. 
+ #
+-XA_DLL_PATH = /usr/local/xanim/mods
++XA_DLL_PATH = /usr/lib/xanim/mods-export
+ 
+ 
+ ##########################################################################
+@@ -208,9 +205,9 @@
+ # XA_CVID_DEF = -DXA_CVID
+ # XA_CYUV_DEF = -DXA_CYUV
+ #
+-#XA_IV32_LIB = mods/xa2.0_iv32_linuxELF.o
+-#XA_CVID_LIB = mods/xa2.0_cvid_linuxELF.o
+-#XA_CYUV_LIB = mods/xa1.0_cyuv_linuxELF.o
++XA_IV32_LIB = mods/xa2.1_iv32_linuxELFg21.o
++XA_CVID_LIB = mods/xa2.0_cvid_linuxELFg21.o
++XA_CYUV_LIB = mods/xa1.0_cyuv_linuxELFg21.o
+ #
+ ###########################
+ # NOTE: SGI Machines Only: 
+@@ -297,16 +294,16 @@
+ # XLIBDIR = -L/usr/openwin/lib
+ #
+ ###-- Linux using X11R6
+-INCLUDE =  -I/usr/X11R6/include -I/usr/X11R6/include/X11
+-XLIBDIR = -L/usr/X11R6/lib
++INCLUDE =  -I/usr/include -I/usr/include/X11
++XLIBDIR = -L/usr/lib
+ #
+ ###-- My SunOS machine running X11R5
+ # INCLUDE = -I/usr/X11R5/include -I/usr/X11R5/include/X11
+ # XLIBDIR = -L/usr/X11R5/lib  -lnsl
+ #
+ ###-- My SunOS machine running X11R6
+-# INCLUDE = -I/usr/X11R6/include -I/usr/X11R6/include/X11
+-# XLIBDIR = -L/usr/X11R6/lib  -lnsl
++# INCLUDE = -I/usr/include -I/usr/include/X11
++# XLIBDIR = -L/usr/lib  -lnsl
+ #
+ ###-- Win32 
+ #-- This depends on where you installed the Cygnus X11 includes and libs.
+@@ -534,8 +531,8 @@
+ #
+ 
+ XA_DEFS = $(XA_MISC_DEFS) $(XA_MOD_DEFS) $(XA_AUDIO_DEFS) -DXA_PETUNIA -DXA_KPCD -DXA_EXPORT -DXA_EXPORT_QT
+-XA_LIBS = $(XA_X11R6_LIBS) $(XA_MACH_LIBS) $(XA_MOD_LIBS) $(XA_AUDIO_LIBS) -lpthread quicktime/quicktime/libquicktime.a -ljpeg -lpng -lz
+-XA_INCS = $(INCLUDE) $(XA_VIDEO_INCS) $(XA_AUDIO_INCS) -Iquicktime/quicktime
++XA_LIBS = $(XA_X11R6_LIBS) $(XA_MACH_LIBS) $(XA_MOD_LIBS) $(XA_AUDIO_LIBS) -ljpeg -lpng $(shell pkg-config --libs libquicktime)
++XA_INCS = $(INCLUDE) $(XA_VIDEO_INCS) $(XA_AUDIO_INCS) $(shell pkg-config --cflags libquicktime)
+ CFLAGS	=  $(DEBUG) $(OPTIMIZE)
+ 
+ #####################################
diff --git a/media-video/xanim-export/files/2.80.1-implicit_funcs.patch b/media-video/xanim-export/files/2.80.1-implicit_funcs.patch
new file mode 100644
index 000000000000..f8fba207b4b2
--- /dev/null
+++ b/media-video/xanim-export/files/2.80.1-implicit_funcs.patch
@@ -0,0 +1,33 @@
+--- xa_g72x.c
++++ xa_g72x.c
+@@ -30,6 +30,7 @@
+  * Common routines for G.721 and G.723 conversions.
+  */
+ 
++#include <stdlib.h>
+ #include "xa_g72x.h"
+ 
+ static short power2[15] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80,
+--- xa_export.c
++++ xa_export.c
+@@ -7,7 +7,8 @@
+ 
+ 
+ 
+-
++#include <stdlib.h>
++#include <string.h>
+ #include <stdio.h>
+ #include <signal.h>
+ #include <jpeglib.h>
+--- xa_audio.c
++++ xa_audio.c
+@@ -227,7 +227,7 @@
+ */
+ 
+ /* TOP */
+-
++#include <sys/ioctl.h>
+ #include "xa_audio.h"
+ 
+ /* POD note:  For opening audio device non-blocking. Should probably set it
diff --git a/media-video/xanim-export/xanim-export-2.80.1-r5.ebuild b/media-video/xanim-export/xanim-export-2.80.1-r5.ebuild
new file mode 100644
index 000000000000..07e02e9a6b8d
--- /dev/null
+++ b/media-video/xanim-export/xanim-export-2.80.1-r5.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/xanim-export/xanim-export-2.80.1-r5.ebuild,v 1.1 2010/07/01 19:52:41 xarthisius Exp $
+
+inherit flag-o-matic eutils toolchain-funcs
+
+_XA_CYUV_sparc=xa1.0_cyuv_sparcELF.o
+_XA_CVID_sparc=xa2.0_cvid_sparcELF.o
+_XA_IV32_sparc=xa2.0_iv32_sparcELF.o
+_XA_EXT_sparc=.Z
+
+_XA_CYUV_x86=xa1.0_cyuv_linuxELFg21.o
+_XA_CVID_x86=xa2.0_cvid_linuxELFg21.o
+_XA_IV32_x86=xa2.1_iv32_linuxELFg21.o
+_XA_EXT_x86=.gz
+
+_XA_CYUV_ppc=xa1.0_cyuv_linuxPPC.o
+_XA_CVID_ppc=xa2.0_cvid_linuxPPC.o
+_XA_IV32_ppc=xa2.0_iv32_linuxPPC.o
+_XA_EXT_ppc=.Z
+
+MY_P="xanim_exporting_edition"
+
+# This might leave _XA_EXT empty and that's fine, just indicates no
+# particular support for a given arch
+eval _XA_EXT=\${_XA_EXT_${ARCH}}
+eval _XA_CVID=\${_XA_CVID_${ARCH}}
+eval _XA_CYUV=\${_XA_CYUV_${ARCH}}
+eval _XA_IV32=\${_XA_IV32_${ARCH}}
+
+# Not much we could do here, the modules are predownloaded and
+# xanim-export compiles against them
+QA_EXECSTACK_x86="usr/bin/xanim-export
+	    usr/lib/xanim/mods-export/${_XA_CVID}
+	    usr/lib/xanim/mods-export/${_XA_CYUV}
+	    usr/lib/xanim/mods-export/${_XA_IV32}
+	    usr/lib/xanim/mods-export/${_XA_CVID/g21/}
+	    usr/lib/xanim/mods-export/${_XA_CYUV/g21/}
+	    usr/lib/xanim/mods-export/xa2.0_iv32_linuxELF.o"
+
+DESCRIPTION="XAnim with Quicktime and RAW Audio export functions"
+HOMEPAGE="http://heroin.linuxave.net/toys.html"
+SRC_URI="http://heroine.linuxave.net/${MY_P}.tar.gz
+	sparc? (
+		ftp://xanim.va.pubnix.com/modules/${_XA_CYUV_sparc}${_XA_EXT_sparc}
+		ftp://xanim.va.pubnix.com/modules/${_XA_CVID_sparc}${_XA_EXT_sparc}
+		ftp://xanim.va.pubnix.com/modules/${_XA_IV32_sparc}${_XA_EXT_sparc}
+	)
+	ppc? (
+		ftp://xanim.va.pubnix.com/modules/${_XA_CYUV_ppc}${_XA_EXT_ppc}
+		ftp://xanim.va.pubnix.com/modules/${_XA_CVID_ppc}${_XA_EXT_ppc}
+		ftp://xanim.va.pubnix.com/modules/${_XA_IV32_ppc}${_XA_EXT_ppc}
+	)
+	x86? (
+		ftp://xanim.va.pubnix.com/modules/${_XA_CYUV_x86}${_XA_EXT_x86}
+		ftp://xanim.va.pubnix.com/modules/${_XA_CVID_x86}${_XA_EXT_x86}
+		ftp://xanim.va.pubnix.com/modules/${_XA_IV32_x86}${_XA_EXT_x86}
+	)"
+
+LICENSE="XAnim"
+SLOT="0"
+KEYWORDS="~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/jpeg-6b
+	>=media-libs/libpng-1.2.1
+	x11-libs/libXext
+	x11-libs/libXt
+	media-libs/libquicktime"
+DEPEND="${RDEPEND}
+	app-arch/ncompress
+	x11-proto/xextproto
+	x11-proto/xproto
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+
+	if [[ -n ${_XA_EXT} ]]; then
+		cd "${S}"/mods || die
+		unpack ${_XA_CVID}${_XA_EXT}
+		unpack ${_XA_CYUV}${_XA_EXT}
+		unpack ${_XA_IV32}${_XA_EXT}
+	fi
+
+	cd "${S}"
+	rm -f xanim
+	epatch "${FILESDIR}"/${PV}-gentoo.patch \
+		"${FILESDIR}"/${PV}-implicit_funcs.patch
+}
+
+src_compile() {
+	tc-export CC
+	make \
+		XA_IV32_LIB=mods/${_XA_CYUV} \
+		XA_CVID_LIB=mods/${_XA_CVID} \
+		XA_CYUV_LIB=mods/${_XA_IV32} \
+		OPTIMIZE="${CFLAGS}" \
+		|| die "main make failed"
+}
+
+src_install() {
+	newbin xanim xanim-export
+	insinto /usr/lib/xanim/mods-export
+	doins mods/*
+	dodoc README*
+	dodoc docs/README.* docs/*.readme docs/*.doc
+}