Fix not respecting LDFLAGS, Bug #339743.

Package-Manager: portage-2.2_rc88/cvs/Linux x86_64

4 files changed, 211 insertions, 7 deletions

diff --git a/media-plugins/vdr-xineliboutput/ChangeLog b/media-plugins/vdr-xineliboutput/ChangeLog
index edd68a9e8a42..08ecef9ecbfe 100644
--- a/media-plugins/vdr-xineliboutput/ChangeLog
+++ b/media-plugins/vdr-xineliboutput/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-xineliboutput
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.54 2010/09/22 13:12:24 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.55 2010/10/05 13:35:22 zzam Exp $
+
+*vdr-xineliboutput-1.0.5-r1 (05 Oct 2010)
+
+  05 Oct 2010; Matthias Schwarzott <zzam@gentoo.org>
+  +vdr-xineliboutput-1.0.5-r1.ebuild,
+  +files/vdr-xineliboutput-1.0.5-ldflags.patch:
+  Fix not respecting LDFLAGS, Bug #339743.
 
   22 Sep 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-xineliboutput-9999.ebuild:
diff --git a/media-plugins/vdr-xineliboutput/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index bf1b1e104741..0bcd22ffc082 100644
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX confd-1.0.0_pre6 856 RMD160 0d48271fe6041316f7ad95267f180f896b76c78b SHA1 5d4591f1a2525cdebbda53636c1138cf3563e592 SHA256 fd30a70c06553463414e93771306a59fdabbcf674218dac49d4af46096d6089b
 AUX vdr-xineliboutput-1.0.4_p20090810-compile-fix.diff 3657 RMD160 7f7c9b16b3c00cabe826971cbd3d7a559b1f5577 SHA1 b0cb9b85ee75800045076616da182d5b9eda38a5 SHA256 e4062ec7b43136b2113173641a6b5b7a2d50cd892a0aec8cf778c97874f84743
+AUX vdr-xineliboutput-1.0.5-ldflags.patch 1382 RMD160 92521e35a1e1f30c0f8da49c4e2673cadef03b62 SHA1 0b686aab9344dda5db7e66c77a6acab9437e0020 SHA256 e455aaf86c771e71848f01bd281ac4cbdc4c710a91b1896069bbf41da5c876ad
 DIST vdr-xineliboutput-1.0.2.tgz 325042 RMD160 8564fd1c55c50e665168f4cd46a7bea33419257e SHA1 e7eadd3774429804b168928a840253d827fb5dcf SHA256 de8e4dbb60b73e91f7e13859b3bb246545c201edceb97431ae2bb08933b015b6
 DIST vdr-xineliboutput-1.0.3.tgz 329144 RMD160 b78c8f53d6406c9f499a090d97f082a6d08ec5a1 SHA1 0a97ccb92bbef13421371294dbde8884d7d1d496 SHA256 a194fbdfc79791f0980715dcb98b1f9393562052e125aedb8401f4691be1ae92
 DIST vdr-xineliboutput-1.0.4.tgz 327859 RMD160 2faef32accf4f985bf1a7e748a7d18ccfa519337 SHA1 389d51ea3b56fd312b5273cd3f9ba19fe9e46732 SHA256 c1cb82e02b193356864c0f6e12fb9ef59406fc2ce94244925d7523b3ec58e8ef
@@ -16,15 +17,15 @@ EBUILD vdr-xineliboutput-1.0.4.ebuild 3249 RMD160 411e63c3442547b0db4c74aa83791f
 EBUILD vdr-xineliboutput-1.0.4_p20090810.ebuild 3454 RMD160 4c2dc09359fe5aead90733042f74a429c6eca8e7 SHA1 39f54fe4ad756d1e8e381479f6968552c13f63d8 SHA256 14d5165b4c436252b1a1d9150c98bec7015976f338119a8292d57fee0e730f11
 EBUILD vdr-xineliboutput-1.0.4_p20090820.ebuild 3599 RMD160 72eff37458948d0b9fd287a1be5f30415bda9ca3 SHA1 492dee6e3f7cf2441240aefe96c45929a7ea5c22 SHA256 a22b7a8841c205645f58c53f659fd7cc4dcfdb96f5e8a0916956e56713af1a2f
 EBUILD vdr-xineliboutput-1.0.4_p20091118.ebuild 3599 RMD160 018f6f522d695eb41e40375308aed8b128452ba1 SHA1 c3772597201502f3a785ecc61e4e896eb549faac SHA256 948f05820dac82cfbb137729541790e3fb6228b36ec08dc0799749c60e096de0
+EBUILD vdr-xineliboutput-1.0.5-r1.ebuild 3603 RMD160 b639fe120ee0f4b414c28099801034efbbde34b9 SHA1 474d879901c527dbb640c02be3fbda20d3468a3a SHA256 43acac7740bfca1e0abe75a6608ddbcbccf03f89eb4b90303c089cefbda337eb
 EBUILD vdr-xineliboutput-1.0.5.ebuild 3536 RMD160 4eeb1bdec5e3bb4fd8e200dd9d4441434ba40b10 SHA1 a89f6c96a8080458f8bcb36b1ee936227858d135 SHA256 06a9b61f7e7616ae73a79affe464285173f7465d7f6199fb56c56aaa5aa2a866
 EBUILD vdr-xineliboutput-9999.ebuild 3589 RMD160 c2dccc24fe81423264db818ffd3dc060e4c69c6b SHA1 cff32865d0c24370812fdafb8183de91efb94274 SHA256 f0880bbbaa73c9ff0997b505e89d98f49302bef5fbccaf2ddeff7f1276a63f25
-MISC ChangeLog 11230 RMD160 ba516f6c91e7f5005672f41792918f39202f8d2f SHA1 30067183fbd869762141b55a6058f7521b5aa587 SHA256 f8f49677f430c7a39f25087efc7820779e5639c029db800a64c5cf8da5ffeef2
+MISC ChangeLog 11451 RMD160 e9cf74050a800e1c317e32d45ed30b3f0eadceac SHA1 8fac12e82c49f65fa496a2e592ec174ad4cc495b SHA256 9b31c7fd5a2f023137a1f432700c29d006e728710cde90883736b1e6da60d4fc
 MISC metadata.xml 669 RMD160 b44f9873f5344ac61790204fb0d984749c382bae SHA1 d33350e1172589fb78170cfafdbc7e02e410a714 SHA256 e1aa0b3247ebf31c8de11efd7bb835ea989c92c5b505ac15347c1bb277f8b8a2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-Comment: added by hd_brummy@gentoo.org
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iD8DBQFMmgEAdn07HTTCgIoRAhkvAJ9aw83C5rfAAuAcTxs/eL9Ld3FVbgCcDs5q
-lB44AiUdqZ22Ks2nGv2T3yE=
-=BKGA
+iEYEARECAAYFAkyrKQ8ACgkQt2vP6XvVdOeriwCdE8IywBjyhnNYKSZY+P6HzuPY
+ASkAn3o/hUv50JuWmv1U2s/CX6OQAdan
+=OrJR
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.5-ldflags.patch b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.5-ldflags.patch
new file mode 100644
index 000000000000..64417a912b12
--- /dev/null
+++ b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.5-ldflags.patch
@@ -0,0 +1,34 @@
+--- xineliboutput-1.0.5/Makefile.orig	2010-10-05 15:26:49.000000000 +0200
++++ xineliboutput-1.0.5/Makefile	2010-10-05 15:29:49.000000000 +0200
+@@ -111,11 +111,11 @@
+ ifeq ($(APPLE_DARWIN), 1)
+     CXXFLAGS   ?= -O3 -pipe -Wall -Woverloaded-virtual -fPIC -g -fno-common -bundle -flat_namespace -undefined suppress
+     CFLAGS     ?= -O3 -pipe -Wall -fPIC -g -fno-common -bundle -flat_namespace -undefined suppress
+-    LDFLAGS_SO ?= -fvisibility=hidden
++    LDFLAGS_SO ?= $(LDFLAGS) -fvisibility=hidden
+ else
+     CXXFLAGS   ?= -O3 -pipe -Wall -Woverloaded-virtual -fPIC -g 
+     CFLAGS     ?= -O3 -pipe -Wall -fPIC -g
+-    LDFLAGS_SO ?= -shared -fvisibility=hidden 
++    LDFLAGS_SO ?= $(LDFLAGS) -shared -fvisibility=hidden 
+ endif
+ LIBS_VDR ?= 
+ 
+@@ -482,7 +482,7 @@
+ 	@-rm -rf $(LIBDIR)/$(VDRPLUGIN_SXFE_SO).$(VERSION)
+ 	@cp $@ $(LIBDIR)/$(VDRPLUGIN_SXFE_SO).$(VERSION)
+ $(VDRSXFE): $(OBJS_SXFE)
+-	$(CC) -g $(OBJS_SXFE) $(LIBS_X11) -ljpeg $(LIBS_XINE) -o $@
++	$(CC) -g $(LDFLAGS) $(OBJS_SXFE) $(LIBS_X11) -ljpeg $(LIBS_XINE) -o $@
+ endif
+ 
+ ifeq ($(XINELIBOUTPUT_FB), 1)
+@@ -491,7 +491,7 @@
+ 	@-rm -rf $(LIBDIR)/$(VDRPLUGIN_FBFE_SO).$(VERSION)
+ 	@cp $@ $(LIBDIR)/$(VDRPLUGIN_FBFE_SO).$(VERSION)
+ $(VDRFBFE): $(OBJS_FBFE)
+-	$(CC) -g $(OBJS_FBFE) $(LIBS_XINE) -ljpeg -o $@
++	$(CC) -g $(LDFLAGS) $(OBJS_FBFE) $(LIBS_XINE) -ljpeg -o $@
+ endif
+ 
+ ifeq ($(XINELIBOUTPUT_XINEPLUGIN), 1)
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.5-r1.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..900721ee1e74
--- /dev/null
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.5-r1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.5-r1.ebuild,v 1.1 2010/10/05 13:35:22 zzam Exp $
+
+GENTOO_VDR_CONDITIONAL=yes
+
+EAPI="2"
+
+inherit vdr-plugin eutils multilib versionator
+
+MY_PV=${PV#*_p}
+MY_P=${PN}-cvs-${MY_PV}
+
+DESCRIPTION="Video Disk Recorder Xinelib PlugIn"
+HOMEPAGE="http://sourceforge.net/projects/xineliboutput/"
+SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+vdr +xine fbcon X libextractor xinerama"
+
+# both vdr plugin or vdr-sxfe can use X11
+# still depends need some cleanup
+COMMON_DEPEND="
+	vdr? (
+		>=media-video/vdr-1.4.0
+		!>=media-video/vdr-1.7
+	)
+
+	xine? ( >=media-libs/xine-lib-1.1.1 )
+
+	media-libs/jpeg
+	libextractor? ( >=media-libs/libextractor-0.5.20 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXv
+		x11-libs/libXext
+		x11-libs/libXrender
+		xinerama? ( x11-libs/libXinerama )
+	)"
+
+DEPEND="${COMMON_DEPEND}
+	sys-kernel/linux-headers
+	X? (
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+		x11-proto/xproto
+		x11-proto/renderproto
+		xinerama? ( x11-proto/xineramaproto )
+	)"
+
+RDEPEND="${COMMON_DEPEND}"
+
+#S=${WORKDIR}/${MY_P#vdr-}
+
+VDR_CONFD_FILE=${FILESDIR}/confd-1.0.0_pre6
+
+pkg_setup() {
+	vdr-plugin_pkg_setup
+
+	if ! use vdr && ! use xine; then
+		eerror "Compiling ${PN} with USE='-vdr -xine' is not possible."
+		eerror "You either need at least one of these flags."
+		#die "${PN} cannot be used with vdr support and xine support disabled!"
+	fi
+}
+
+use_onoff() {
+	if use "$1"; then
+		echo 1
+	else
+		echo 0
+	fi
+}
+
+use_onoff_xine() {
+	if use xine && use "$1"; then
+		echo 1
+	else
+		echo 0
+	fi
+}
+
+src_prepare() {
+	vdr-plugin_src_prepare
+
+	epatch "${FILESDIR}/${P}-ldflags.patch"
+	if use xine; then
+		XINE_PLUGIN_DIR=$(xine-config --plugindir)
+		if [[ ${XINE_PLUGIN_DIR} = "" ]]; then
+			eerror "Could not find xine plugin dir"
+			die "Could not find xine plugin dir"
+		fi
+	fi
+
+	# stop some automagic overwriting of the stuff we set
+	sed -e '/XINELIBOUTPUT_VDRPLUGIN = 1/s/^/#/' \
+		-e '/HAVE_EXTRACTOR_H = 1/s/^/#/' \
+		-i Makefile
+
+	cat >>Make.config <<-EOF
+		XINELIBOUTPUT_XINEPLUGIN = $(use_onoff xine)
+		XINELIBOUTPUT_VDRPLUGIN = $(use_onoff vdr)
+
+		XINELIBOUTPUT_FB = $(use_onoff_xine fbcon)
+		XINELIBOUTPUT_X11 = $(use_onoff_xine X)
+
+		HAVE_XRENDER = 1
+		HAVE_XDPMS = 1
+		HAVE_EXTRACTOR_H = $(use_onoff libextractor)
+		HAVE_XINERAMA = $(use_onoff xinerama)
+	EOF
+
+	# patching makefile to work with this
+	# $ rm ${outdir}/file; cp file ${outdir}/file
+	# work in the sandbox
+	sed -i Makefile \
+		-e 's:XINEPLUGINDIR.*=.*:XINEPLUGINDIR = '"${WORKDIR}/lib:" \
+		-e 's:VDRINCDIR.*=.*:VDRINCDIR ?= /usr/include:'
+	mkdir -p "${WORKDIR}/lib"
+}
+
+src_configure() { :; }
+
+src_install() {
+	if use vdr; then
+		# install vdr plugin
+		vdr-plugin_src_install
+
+		# version number that the sources contain
+		local SO_VERSION="$(grep 'static const char \*VERSION *=' xineliboutput.c |\
+						cut	-d'"' -f2)"
+	echo SO_VERSION=$SO_VERSION
+		insinto ${VDR_PLUGIN_DIR}
+		if use fbcon; then
+			doins libxineliboutput-fbfe.so.${SO_VERSION} || die "doins failed"
+		fi
+		if use X; then
+			doins libxineliboutput-sxfe.so.${SO_VERSION} || die "doins failed"
+		fi
+	fi
+
+	if use xine; then
+		# install xine-plugins
+		insinto "${XINE_PLUGIN_DIR}"
+		doins xineplug_inp_*.so
+
+		insinto "${XINE_PLUGIN_DIR}"/post
+		doins xineplug_post_*.so
+
+		# install xine-based frontends
+		use fbcon && dobin vdr-fbfe
+		use X && dobin vdr-sxfe
+
+	fi
+}
+
+pkg_config() {
+	einfo "emerge --config is not supported"
+}