Moved mp1e to its own ebuild. Added patch against TEXTREL - now all files get compiled with c++ compiler. Assigned package to Gentoo VDR Project.

(Portage version: 2.1.1_pre5-r1)

6 files changed, 109 insertions, 5 deletions

diff --git a/media-plugins/vdr-analogtv/ChangeLog b/media-plugins/vdr-analogtv/ChangeLog
index 14b971adacaf..ebe524056539 100644
--- a/media-plugins/vdr-analogtv/ChangeLog
+++ b/media-plugins/vdr-analogtv/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/vdr-analogtv
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-analogtv/ChangeLog,v 1.5 2006/05/16 13:26:07 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-analogtv/ChangeLog,v 1.6 2006/08/16 11:32:47 zzam Exp $
+
+*vdr-analogtv-0.9.37-r1 (16 Aug 2006)
+
+  16 Aug 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-analogtv-sane-c++.diff, metadata.xml,
+  vdr-analogtv-0.9.37.ebuild, +vdr-analogtv-0.9.37-r1.ebuild:
+  Moved mp1e to its own ebuild. Added patch against TEXTREL - now all files
+  get compiled with c++ compiler. Assigned package to Gentoo VDR Project.
 
   16 May 2006; Matthias Schwarzott <zzam@gentoo.org>
   vdr-analogtv-0.9.37.ebuild:
diff --git a/media-plugins/vdr-analogtv/files/digest-vdr-analogtv-0.9.37-r1 b/media-plugins/vdr-analogtv/files/digest-vdr-analogtv-0.9.37-r1
new file mode 100644
index 000000000000..537797fff2a3
--- /dev/null
+++ b/media-plugins/vdr-analogtv/files/digest-vdr-analogtv-0.9.37-r1
@@ -0,0 +1,3 @@
+MD5 8fc4a9dfd43ac6f95b0c30d3c39214f3 vdr-analogtv-0.9.37.tar.bz2 140955
+RMD160 4a641c2cbb7ac54cc044bf4be85e59b853a9ec62 vdr-analogtv-0.9.37.tar.bz2 140955
+SHA256 5a29800121d33f0c02870554d25a55a64b4e34aab9e5afa4b65eb42df5b4b59a vdr-analogtv-0.9.37.tar.bz2 140955
diff --git a/media-plugins/vdr-analogtv/files/vdr-analogtv-sane-c++.diff b/media-plugins/vdr-analogtv/files/vdr-analogtv-sane-c++.diff
new file mode 100644
index 000000000000..f39cdbfc98d1
--- /dev/null
+++ b/media-plugins/vdr-analogtv/files/vdr-analogtv-sane-c++.diff
@@ -0,0 +1,58 @@
+diff -ru analogtv-1.0.00-orig/Makefile analogtv-1.0.00/Makefile
+--- analogtv-1.0.00-orig/Makefile	2006-07-24 12:07:50.916519443 +0200
++++ analogtv-1.0.00/Makefile	2006-07-24 12:18:40.059961942 +0200
+@@ -93,8 +93,6 @@
+ all: libvdr-$(PLUGIN).so
+ .PHONY: all
+ 
+-player-analogtv.o: player-analogtv.c
+-	$(CC) $(CCFLAGS) -c $(DEFINES) $(INCLUDES) $(OPTFLAGS) player-analogtv.c
+ 
+ libvdr-$(PLUGIN).so: $(OBJS) $(FFLIB)
+ 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -ldvbmpegtools -o $@
+diff -ru analogtv-1.0.00-orig/player-analogtv.c analogtv-1.0.00/player-analogtv.c
+--- analogtv-1.0.00-orig/player-analogtv.c	2006-07-24 12:07:50.916519443 +0200
++++ analogtv-1.0.00/player-analogtv.c	2006-07-24 12:17:51.315176601 +0200
+@@ -12,6 +12,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <stdarg.h>
+ #include <string.h>
+ #include <time.h>
+@@ -26,6 +27,7 @@
+ #include <sys/mman.h>
+ #include <sys/sysinfo.h>
+ #include <sys/soundcard.h>
++#include <sys/wait.h>
+ 
+ #include <transform.h>
+ #undef MIN
+@@ -282,7 +284,7 @@
+       }
+ 
+       if (i < MAXSOURCES)
+-        strcpy(sources[i], input.name);
++        strcpy(sources[i], (char*) input.name);
+ 
+       d(1, "Detected Input#%d: %s", i, input.name);
+     }
+@@ -866,7 +868,7 @@
+ {
+   register int  f, r = 0, rv, rmax = 0, cc = 0, i;
+   register int  dropped = 0, dropwarned = 1, skipped = 0;
+-  auto     UC   buffer[BUFFSIZE], sx[128], cmd[256];
++  auto     char buffer[BUFFSIZE], sx[128], cmd[256];
+   auto	   FILE *fi;
+ 
+   for (i = 0; i < NUM_BUFS; i++)
+@@ -936,7 +938,7 @@
+       spes += r;
+ 
+       if (r > 0)
+-        kpes_to_ts(&p2t, buffer, r); // PES -> TS
++        kpes_to_ts(&p2t, (uint8_t*) buffer, r); // PES -> TS
+     }
+   }
+ 
diff --git a/media-plugins/vdr-analogtv/metadata.xml b/media-plugins/vdr-analogtv/metadata.xml
index 3aaff838ed8d..d1b88e6872a7 100644
--- a/media-plugins/vdr-analogtv/metadata.xml
+++ b/media-plugins/vdr-analogtv/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 <herd>media-tv</herd>
 <maintainer>
-<email>zzam@gentoo.org</email>
-<name>Matthias Schwarzott</name>
+<email>vdr@gentoo.org</email>
+<name>Gentoo VDR Project</name>
 </maintainer>
 <longdescription lang="en">
 </longdescription>
diff --git a/media-plugins/vdr-analogtv/vdr-analogtv-0.9.37-r1.ebuild b/media-plugins/vdr-analogtv/vdr-analogtv-0.9.37-r1.ebuild
new file mode 100644
index 000000000000..186875e9ed20
--- /dev/null
+++ b/media-plugins/vdr-analogtv/vdr-analogtv-0.9.37-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-analogtv/vdr-analogtv-0.9.37-r1.ebuild,v 1.1 2006/08/16 11:32:47 zzam Exp $
+
+inherit vdr-plugin eutils
+
+DESCRIPTION="VDR plugin: Support analog-tv devices as input"
+HOMEPAGE="http://www.ko0l.de/download/vdr/analogtv/index.html"
+SRC_URI="http://www.ko0l.de/download/vdr/analogtv/download/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND=">=media-video/vdr-1.2.6
+	media-libs/libdvb"
+RDEPEND="${DEPEND}
+	media-video/mp1e"
+
+src_unpack()
+{
+	vdr-plugin_src_unpack
+
+	cd ${S}
+
+	sed -i -e "s:^INCLUDES += :INCLUDES += -I/usr/include/libdvb :" Makefile
+
+	epatch ${FILESDIR}/${P}-gcc-3.4.diff
+	epatch ${FILESDIR}/${P}-asm-fpic.diff
+	epatch ${FILESDIR}/${P}-kpes_to_ts.patch
+	epatch ${FILESDIR}/${P}-includes.diff
+	epatch ${FILESDIR}/${PN}-sane-c++.diff
+}
diff --git a/media-plugins/vdr-analogtv/vdr-analogtv-0.9.37.ebuild b/media-plugins/vdr-analogtv/vdr-analogtv-0.9.37.ebuild
index 4f78e5187c98..2afad63931d9 100644
--- a/media-plugins/vdr-analogtv/vdr-analogtv-0.9.37.ebuild
+++ b/media-plugins/vdr-analogtv/vdr-analogtv-0.9.37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-analogtv/vdr-analogtv-0.9.37.ebuild,v 1.4 2006/05/16 13:26:07 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-analogtv/vdr-analogtv-0.9.37.ebuild,v 1.5 2006/08/16 11:32:47 zzam Exp $
 
 inherit vdr-plugin eutils
 
@@ -17,7 +17,8 @@ KEYWORDS="x86"
 IUSE=""
 
 DEPEND=">=media-video/vdr-1.2.6
-	media-libs/libdvb"
+	media-libs/libdvb
+	!media-video/mp1e"
 
 src_unpack()
 {