summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2009-08-10 12:12:01 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2009-08-10 12:12:01 +0000
commit405b9b0f35ef3c96693ca6c6d0f592c920e75ff4 (patch)
tree234cc94766f581370fffea41292508741ecefac6 /media-plugins/vdr-xineliboutput
parentFix building with GCC 4.4+ by removing -Werror wrt #277765. (diff)
downloadhistorical-405b9b0f35ef3c96693ca6c6d0f592c920e75ff4.tar.gz
historical-405b9b0f35ef3c96693ca6c6d0f592c920e75ff4.tar.bz2
historical-405b9b0f35ef3c96693ca6c6d0f592c920e75ff4.zip
Added a new snapshot. It needs a compile fix patch. Fixes compiling with glibc-2.10, Bug #278395.
Package-Manager: portage-2.1.6.13/cvs/Linux i686
Diffstat (limited to 'media-plugins/vdr-xineliboutput')
-rw-r--r--media-plugins/vdr-xineliboutput/ChangeLog10
-rw-r--r--media-plugins/vdr-xineliboutput/Manifest11
-rw-r--r--media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.4_p20090810-compile-fix.diff77
-rw-r--r--media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20090810.ebuild151
4 files changed, 244 insertions, 5 deletions
diff --git a/media-plugins/vdr-xineliboutput/ChangeLog b/media-plugins/vdr-xineliboutput/ChangeLog
index dfc3756bfdd8..6ca137340c2c 100644
--- a/media-plugins/vdr-xineliboutput/ChangeLog
+++ b/media-plugins/vdr-xineliboutput/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for media-plugins/vdr-xineliboutput
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.44 2009/03/25 11:06:22 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.45 2009/08/10 12:12:01 zzam Exp $
+
+*vdr-xineliboutput-1.0.4_p20090810 (10 Aug 2009)
+
+ 10 Aug 2009; Matthias Schwarzott <zzam@gentoo.org>
+ +vdr-xineliboutput-1.0.4_p20090810.ebuild,
+ +files/vdr-xineliboutput-1.0.4_p20090810-compile-fix.diff:
+ Added a new snapshot. It needs a compile fix patch. Fixes compiling with
+ glibc-2.10, Bug #278395.
25 Mar 2009; Matthias Schwarzott <zzam@gentoo.org> Manifest:
Fix manifest
diff --git a/media-plugins/vdr-xineliboutput/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index 45620108c99e..56f4d07c9b3b 100644
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
AUX confd-1.0.0_pre6 856 RMD160 0d48271fe6041316f7ad95267f180f896b76c78b SHA1 5d4591f1a2525cdebbda53636c1138cf3563e592 SHA256 fd30a70c06553463414e93771306a59fdabbcf674218dac49d4af46096d6089b
AUX vdr-xineliboutput-1.0.0_rc2-vdr-1.5.3.diff 712 RMD160 520c285cb48887ae496d12a598cf356bf9b02843 SHA1 b77920e533d878e445847b9520d4653280c4b3b5 SHA256 a453eb5692f6e85bec1cc7297dd61e25405fac09a01504508262aa7f5246d668
AUX vdr-xineliboutput-1.0.0_rc2-vdr-1.5.9.diff 2852 RMD160 58f70d95046ae634fa2415643a05df2a395d7cf0 SHA1 4376acebfeed2c9ea35e076778a89c217da15ddb SHA256 6ac4301424dbeaf1227004824e744af3067e4fd69d8f8c6ce1ea187c5f303e09
+AUX vdr-xineliboutput-1.0.4_p20090810-compile-fix.diff 3657 RMD160 7f7c9b16b3c00cabe826971cbd3d7a559b1f5577 SHA1 b0cb9b85ee75800045076616da182d5b9eda38a5 SHA256 e4062ec7b43136b2113173641a6b5b7a2d50cd892a0aec8cf778c97874f84743
DIST vdr-xineliboutput-1.0.0-1.tgz 322775 RMD160 2d75a834cc7fb87daf50e4232a49103482820994 SHA1 878ac2cd9a95010521325a54e8a12f26cd54d7a9 SHA256 fb1975fbe1fe0772907f6d3fe70694ab12b54d537e06d440a6685a34c2deaefd
DIST vdr-xineliboutput-1.0.0rc1.tgz 263435 RMD160 cd6d0ba5271c40be814b9dff2d6c929872138521 SHA1 051239137b7a6598863172cbcb4fcb186a5ae198 SHA256 367f6113aa8d762be7f28d758af11111d62ed9c85d89d897582c8fb954d44a6f
DIST vdr-xineliboutput-1.0.0rc2.tgz 266010 RMD160 406e48f343258c07e337460754181cd10c180b29 SHA1 867c090a3fd1c8d8c78d7021b2eef0821c71b776 SHA256 e92f2bbc67acd6b5d16ff249055848c0afd4dea04b62e7323c2b2230c8826d08
@@ -12,6 +13,7 @@ DIST vdr-xineliboutput-1.0.2.tgz 325042 RMD160 8564fd1c55c50e665168f4cd46a7bea33
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
DIST vdr-xineliboutput-cvs-20080120.tar.bz2 244376 RMD160 2256079c9a2cbab5fd4f47232aaee282ca4b7d57 SHA1 d8ba0f859b3be5ffe5f8fb37518996bb6b6082ef SHA256 54aa155c79a23669e9bb6f376846012a008ec13cd3f05e48bdae7acc9f6e155e
+DIST vdr-xineliboutput-cvs-20090810.tar.bz2 295621 RMD160 11bd4068b8c862c627ecb7935d0ae5971a267d0b SHA1 5d8a61b21418688dceffaccc2aeb22a7b6b21de4 SHA256 3630eadd9eb97fd997e3d238d2166a0be4e0018bb885d6719b3639461ac22db5
EBUILD vdr-xineliboutput-1.0.0.ebuild 2509 RMD160 f090ce16a09d265acdb803127b42ac84041cf758 SHA1 67ebbe758173d218477df6817a2794ac7953bdbb SHA256 286f368adc9a1d9d91fee9a9ff5152eb6df9424d65a54adc2c6d27baebe7a0c5
EBUILD vdr-xineliboutput-1.0.0_rc1.ebuild 2009 RMD160 ce783135d9b4db3497c5bff020b85d199e0f9d7b SHA1 40e363ccc09450f0dc94f586d47cfdeb0e7f4cc1 SHA256 882e66a2629ecb2de41f6b71085b8006a2ad9e98dbbea924e5a26b96685be7f9
EBUILD vdr-xineliboutput-1.0.0_rc2.ebuild 2107 RMD160 cdc0b11c5c24f017e5d7936faeac5e255c41ec35 SHA1 0a92a7baa79c18228af82f68cdcc96ace486c95f SHA256 64ce7424cfa3d576a32ac08fa667bf3cc77772f08cfbc7315fd8b43b55e4c3a9
@@ -21,12 +23,13 @@ EBUILD vdr-xineliboutput-1.0.1.ebuild 2507 RMD160 8ca24292f7277f128098f27eb8f7a5
EBUILD vdr-xineliboutput-1.0.2.ebuild 2488 RMD160 241301c5e94e5beae82d5c5d2792bc6fe9c9e742 SHA1 9ecbb4cb2279f851d3808ae5edf0a9b8500c808b SHA256 2f3cc79800d3b8584f8005eaccc42cc03c1d33db59504ad7a00cfc80d12600c7
EBUILD vdr-xineliboutput-1.0.3.ebuild 2488 RMD160 68258e9261babef9f2c6c570160afcffa1b16b3a SHA1 55cb09c5edd657ef517a5f8969e5db74968646db SHA256 e7802a2135df2eaebb2411abc6878c9e6a4d19225ac3ca73609dcb725fd4f4ba
EBUILD vdr-xineliboutput-1.0.4.ebuild 3249 RMD160 411e63c3442547b0db4c74aa83791f2bb1d87ef5 SHA1 da370d6fdae3a8b83bb22c4b3bc6b95df356e37d SHA256 c9eb1d61017bd1d7993f0aefa03a0f8ba5c0ef67d084368c487d9fadb883f439
-MISC ChangeLog 9096 RMD160 a5bd9845deceaf18742819e7e64fd3ae1a9bb1c2 SHA1 b2950a5cf72bc54769d61837feddd729a0eecadb SHA256 5fc837839b899cd6cf1f077341de9795c1fa60deeb3a864ef26f2f962e7632ad
+EBUILD vdr-xineliboutput-1.0.4_p20090810.ebuild 3292 RMD160 42f6e34a5321665159fd701d8c2b84e02b29a6fa SHA1 27334e2e048f8fb5ab73a6c022d87978a4c2a986 SHA256 ba281c6bf743269fcdb108d67462e1de3e820098d39c08f749c6140fc212a955
+MISC ChangeLog 9408 RMD160 531fadaecabb21a5bf04cc06240bbb2449b563fd SHA1 23d4ef2aa04fa62caecaf90743d8b32a5e1ac08e SHA256 dea8e13ca02155e8bc5d207dc742cb181f864ff2564abd27dae3c777f2898ef9
MISC metadata.xml 669 RMD160 b44f9873f5344ac61790204fb0d984749c382bae SHA1 d33350e1172589fb78170cfafdbc7e02e410a714 SHA256 e1aa0b3247ebf31c8de11efd7bb835ea989c92c5b505ac15347c1bb277f8b8a2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAknKEDkACgkQt2vP6XvVdOf5EACeNwrcRF5Ft94CGZQLi6Xy115b
-FsUAoMOSwzGIhnxapRj6uGh/f3ooA2X0
-=8nT3
+iEYEARECAAYFAkqADpcACgkQt2vP6XvVdOeVegCgp0XrHjGFJpf0T6FbliuOOfyw
+kNsAn3drS7ZC8JQLGLCAWMq9XfyV540V
+=LZ2X
-----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.4_p20090810-compile-fix.diff b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.4_p20090810-compile-fix.diff
new file mode 100644
index 000000000000..6c94b390fdf6
--- /dev/null
+++ b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.4_p20090810-compile-fix.diff
@@ -0,0 +1,77 @@
+diff -ru xineliboutput-cvs-20090810-orig/xine_fbfe_frontend.c xineliboutput-cvs-20090810/xine_fbfe_frontend.c
+--- xineliboutput-cvs-20090810-orig/xine_fbfe_frontend.c 2009-08-10 13:17:33.000000000 +0200
++++ xineliboutput-cvs-20090810/xine_fbfe_frontend.c 2009-08-10 13:55:13.996629416 +0200
+@@ -139,9 +139,10 @@
+ int xpos, int ypos,
+ int width, int height, int fullscreen, int hud,
+ int modeswitch, const char *modeline, int aspect,
+- fe_keypress_f keyfunc, int no_x_kbd,
++ fe_keypress_f keyfunc, int no_x_kbd, int gui_hotkeys,
+ const char *video_port,
+- int scale_video, int field_order)
++ int scale_video, int field_order,
++ const char *aspect_controller, int window_id)
+ {
+ fe_t *this = (fe_t*)this_gen;
+
+@@ -207,7 +208,7 @@
+ *
+ * configure windows
+ */
+-static int fbfe_display_config(frontend_t *this_gen, int width, int height, int fullscreen,
++static int fbfe_display_config(frontend_t *this_gen, int xpos, int ypos, int width, int height, int fullscreen,
+ int modeswitch, const char *modeline, int aspect,
+ int scale_video, int field_order)
+ {
+diff -ru xineliboutput-cvs-20090810-orig/xine_frontend_main.c xineliboutput-cvs-20090810/xine_frontend_main.c
+--- xineliboutput-cvs-20090810-orig/xine_frontend_main.c 2009-08-10 13:17:34.000000000 +0200
++++ xineliboutput-cvs-20090810/xine_frontend_main.c 2009-08-10 13:59:13.453270355 +0200
+@@ -632,7 +632,14 @@
+
+ /* Initialize display */
+ if(!fe->fe_display_open(fe, xpos, ypos, width, height, fullscreen, hud, 0,
+- "", aspect, NULL, noxkbd, video_port, scale_video, 0)) {
++ "", aspect, NULL, noxkbd, 0, video_port, scale_video, 0,
++ aspect_controller,
++#ifndef IS_FBFE
++ window_id
++#else
++ 0
++#endif
++ )) {
+ fprintf(stderr, "Error opening display\n");
+ fe->fe_free(fe);
+ return -4;
+diff -ru xineliboutput-cvs-20090810-orig/xine_sxfe_frontend.c xineliboutput-cvs-20090810/xine_sxfe_frontend.c
+--- xineliboutput-cvs-20090810-orig/xine_sxfe_frontend.c 2009-08-10 13:17:34.000000000 +0200
++++ xineliboutput-cvs-20090810/xine_sxfe_frontend.c 2009-08-10 13:55:13.999963596 +0200
+@@ -903,8 +903,10 @@
+ int xpos, int ypos,
+ int width, int height, int fullscreen, int hud,
+ int modeswitch, const char *modeline, int aspect,
+- fe_keypress_f keyfunc, int no_x_kbd, const char *video_port,
+- int scale_video, int field_order)
++ fe_keypress_f keyfunc, int no_x_kbd, int gui_hotkeys,
++ const char *video_port,
++ int scale_video, int field_order,
++ const char *aspect_controller, int window_id)
+ {
+ sxfe_t *this = (sxfe_t*)this_gen;
+
+@@ -1156,6 +1158,7 @@
+ * configure windows
+ */
+ static int sxfe_display_config(frontend_t *this_gen,
++ int xpos, int ypos,
+ int width, int height, int fullscreen,
+ int modeswitch, const char *modeline,
+ int aspect, int scale_video,
+@@ -1250,7 +1253,7 @@
+ this->ypos = this->origypos;
+ }
+
+- this->fe.fe_display_config((frontend_t*)this, this->origwidth, this->origheight,
++ this->fe.fe_display_config((frontend_t*)this, -1, -1, this->origwidth, this->origheight,
+ this->fullscreen ? 0 : 1,
+ this->vmode_switch, this->modeline,
+ this->aspect, this->scale_video, this->field_order);
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20090810.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20090810.ebuild
new file mode 100644
index 000000000000..cd2e93b1be5d
--- /dev/null
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20090810.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2009 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.4_p20090810.ebuild,v 1.1 2009/08/10 12:12:01 zzam Exp $
+
+GENTOO_VDR_CONDITIONAL=yes
+
+EAPI="2"
+
+inherit vdr-plugin eutils multilib versionator
+
+MY_PV=${PV#*_p}
+MY_P=${PN}-cvs-${MY_PV}
+
+SO_VERSION="${PV%_p*}"
+SO_VERSION="${SO_VERSION/_/}"
+
+DESCRIPTION="Video Disk Recorder Xinelib PlugIn"
+HOMEPAGE="http://sourceforge.net/projects/xineliboutput/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+vdr +xine fbcon X libextractor"
+
+# both vdr plugin or vdr-sxfe can use X11
+COMMON_DEPEND="
+ vdr? ( >=media-video/vdr-1.4.0 )
+
+ xine? ( >=media-libs/xine-lib-1.1.1 )
+
+ media-libs/jpeg
+ libextractor? ( >=media-libs/libextractor-0.5.20 )"
+
+DEPEND="${COMMON_DEPEND}
+ sys-kernel/linux-headers
+ X? (
+ x11-libs/libX11
+ x11-libs/libXv
+ x11-libs/libXext
+ x11-libs/libXrender
+ )"
+RDEPEND="${COMMON_DEPEND}
+ X? (
+ x11-proto/xextproto
+ x11-proto/xf86vidmodeproto
+ x11-proto/xproto
+ x11-proto/renderproto
+ )"
+
+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}-compile-fix.diff"
+
+ 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)
+ 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_install() {
+ if use vdr; then
+ # install vdr plugin
+ vdr-plugin_src_install
+
+ # There may be no sub-plugin, depending on use-flags
+ insinto ${VDR_PLUGIN_DIR}
+ local f
+ for f in libxineliboutput*.so.${SO_VERSION}; do
+ [[ -f "$f" ]] || continue
+ doins "${f}" || die "could not install sub-plugin ${f}"
+ done
+ 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"
+}