summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2010-10-05 13:35:22 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2010-10-05 13:35:22 +0000
commitd992160af0ac6d012e65ad65e9da4b4e3be6f04f (patch)
tree774f1bf38a315d898e8f25fff316726119345a16 /media-plugins/vdr-xineliboutput
parentAutomated update of use.local.desc (diff)
downloadgentoo-2-d992160af0ac6d012e65ad65e9da4b4e3be6f04f.tar.gz
gentoo-2-d992160af0ac6d012e65ad65e9da4b4e3be6f04f.tar.bz2
gentoo-2-d992160af0ac6d012e65ad65e9da4b4e3be6f04f.zip
Fix not respecting LDFLAGS, Bug #339743.
(Portage version: 2.2_rc88/cvs/Linux x86_64)
Diffstat (limited to 'media-plugins/vdr-xineliboutput')
-rw-r--r--media-plugins/vdr-xineliboutput/ChangeLog9
-rw-r--r--media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.5-ldflags.patch34
-rw-r--r--media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.5-r1.ebuild162
3 files changed, 204 insertions, 1 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/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"
+}