summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-plugins/vdr-analogtv/ChangeLog10
-rw-r--r--media-plugins/vdr-analogtv/Manifest57
-rw-r--r--media-plugins/vdr-analogtv/files/digest-vdr-analogtv-0.9.37-r13
-rw-r--r--media-plugins/vdr-analogtv/files/vdr-analogtv-sane-c++.diff58
-rw-r--r--media-plugins/vdr-analogtv/metadata.xml4
-rw-r--r--media-plugins/vdr-analogtv/vdr-analogtv-0.9.37-r1.ebuild34
-rw-r--r--media-plugins/vdr-analogtv/vdr-analogtv-0.9.37.ebuild5
7 files changed, 143 insertions, 28 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/Manifest b/media-plugins/vdr-analogtv/Manifest
index e60a7c7d2d29..bf54be209871 100644
--- a/media-plugins/vdr-analogtv/Manifest
+++ b/media-plugins/vdr-analogtv/Manifest
@@ -1,44 +1,55 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX vdr-analogtv-0.9.37-asm-fpic.diff 2720 RMD160 d724da30a6f1a23f5c804b2fe83c72b6fc485034 SHA1 ff9adc4de702f96d73b895f88b03e57876d7aa98 SHA256 7a79a4f7b0106681f94e0909e86dc1696aedc0c2e0b5ee7aed9b55d3dd5f7915 size 2720
+AUX vdr-analogtv-0.9.37-asm-fpic.diff 2720 RMD160 d724da30a6f1a23f5c804b2fe83c72b6fc485034 SHA1 ff9adc4de702f96d73b895f88b03e57876d7aa98 SHA256 7a79a4f7b0106681f94e0909e86dc1696aedc0c2e0b5ee7aed9b55d3dd5f7915
MD5 aadc269e760f01aca9684087026c7a18 files/vdr-analogtv-0.9.37-asm-fpic.diff 2720
RMD160 d724da30a6f1a23f5c804b2fe83c72b6fc485034 files/vdr-analogtv-0.9.37-asm-fpic.diff 2720
SHA256 7a79a4f7b0106681f94e0909e86dc1696aedc0c2e0b5ee7aed9b55d3dd5f7915 files/vdr-analogtv-0.9.37-asm-fpic.diff 2720
-AUX vdr-analogtv-0.9.37-gcc-3.4.diff 2586 RMD160 7599d040c5e3c5ab3394ab6bc0d52fab34cfa055 SHA1 adbf6da6d9dba98739c6e09dcff2dcad18417f79 SHA256 3428b60d695aff4b3ef725b11f959beb1ebb11b1a38c1a2454753d72c16b7dff size 2586
+AUX vdr-analogtv-0.9.37-gcc-3.4.diff 2586 RMD160 7599d040c5e3c5ab3394ab6bc0d52fab34cfa055 SHA1 adbf6da6d9dba98739c6e09dcff2dcad18417f79 SHA256 3428b60d695aff4b3ef725b11f959beb1ebb11b1a38c1a2454753d72c16b7dff
MD5 6266d1cd92dd7a446cd70c92c22af9d5 files/vdr-analogtv-0.9.37-gcc-3.4.diff 2586
RMD160 7599d040c5e3c5ab3394ab6bc0d52fab34cfa055 files/vdr-analogtv-0.9.37-gcc-3.4.diff 2586
SHA256 3428b60d695aff4b3ef725b11f959beb1ebb11b1a38c1a2454753d72c16b7dff files/vdr-analogtv-0.9.37-gcc-3.4.diff 2586
-AUX vdr-analogtv-0.9.37-includes.diff 319 RMD160 a2a37619632b11421d6e88ff92b3e45c61805e45 SHA1 42678d4fde4ea82e9015547f758b96c105df52bb SHA256 2ab9547310066b878a8953b72c7106349511943f0bfb48fb782e2953b432e33c size 319
+AUX vdr-analogtv-0.9.37-includes.diff 319 RMD160 a2a37619632b11421d6e88ff92b3e45c61805e45 SHA1 42678d4fde4ea82e9015547f758b96c105df52bb SHA256 2ab9547310066b878a8953b72c7106349511943f0bfb48fb782e2953b432e33c
MD5 a9c0ced3696620529db50b5168b434bf files/vdr-analogtv-0.9.37-includes.diff 319
RMD160 a2a37619632b11421d6e88ff92b3e45c61805e45 files/vdr-analogtv-0.9.37-includes.diff 319
SHA256 2ab9547310066b878a8953b72c7106349511943f0bfb48fb782e2953b432e33c files/vdr-analogtv-0.9.37-includes.diff 319
-AUX vdr-analogtv-0.9.37-kpes_to_ts.patch 697 RMD160 88004b1c86715ffc0621677de659e9f92281343b SHA1 049852097dcbe89b1276cdb25e2333577f70d9bc SHA256 6509f51e531f2a3dd29283117184e2278e529d97e6896747897f36aeef2b1498 size 697
+AUX vdr-analogtv-0.9.37-kpes_to_ts.patch 697 RMD160 88004b1c86715ffc0621677de659e9f92281343b SHA1 049852097dcbe89b1276cdb25e2333577f70d9bc SHA256 6509f51e531f2a3dd29283117184e2278e529d97e6896747897f36aeef2b1498
MD5 ba8f685344a8d264fc7ed5dbf3ad9d94 files/vdr-analogtv-0.9.37-kpes_to_ts.patch 697
RMD160 88004b1c86715ffc0621677de659e9f92281343b files/vdr-analogtv-0.9.37-kpes_to_ts.patch 697
SHA256 6509f51e531f2a3dd29283117184e2278e529d97e6896747897f36aeef2b1498 files/vdr-analogtv-0.9.37-kpes_to_ts.patch 697
-DIST rte-09sep04-mp1e-gentoo.patch 47530 RMD160 310214a1fab00704f7f161827b7317d2589825be SHA256 ce0883c6f63d1bffe1005b8aaa606299621507d9b66051ee3407e9bd856ed7b5 size 47530
-DIST rte-09sep04.tar.bz2 445379 RMD160 5f1260d56d7e7a439f0fece3afef4964aa4099c4 SHA256 e324523f34adb3e4e074e592237fee795b12f54210e0cee09b2eda5910cfd921 size 445379
-DIST vdr-analogtv-0.9.37.tar.bz2 140955 RMD160 4a641c2cbb7ac54cc044bf4be85e59b853a9ec62 SHA256 5a29800121d33f0c02870554d25a55a64b4e34aab9e5afa4b65eb42df5b4b59a size 140955
-EBUILD vdr-analogtv-0.9.37.ebuild 1406 RMD160 94f71221d5a517eea1ddcac8fde225915b1cc066 SHA1 c6314542c410d2a825503553704c92bc445b7b88 SHA256 c7c3dab6f06fdbf72326112551f73312d692674ef71218f3cf9ed25f840baf07 size 1406
-MD5 fbb8ddb206b3982b8baccb7a8a71e465 vdr-analogtv-0.9.37.ebuild 1406
-RMD160 94f71221d5a517eea1ddcac8fde225915b1cc066 vdr-analogtv-0.9.37.ebuild 1406
-SHA256 c7c3dab6f06fdbf72326112551f73312d692674ef71218f3cf9ed25f840baf07 vdr-analogtv-0.9.37.ebuild 1406
-MISC ChangeLog 1039 RMD160 086b2f7a8602f8eb6aa7a71208aedc5b0795ad13 SHA1 139c7ae8d0bc7bdc506a3936f3823ae055c13f9b SHA256 861166a1904e4341c27453fa8751f15334d3536a9e827d18e70d9b18139d5b54 size 1039
-MD5 01013869248d4c1de13ec8a766ee3608 ChangeLog 1039
-RMD160 086b2f7a8602f8eb6aa7a71208aedc5b0795ad13 ChangeLog 1039
-SHA256 861166a1904e4341c27453fa8751f15334d3536a9e827d18e70d9b18139d5b54 ChangeLog 1039
-MISC metadata.xml 300 RMD160 c85719cef743cf573efe73f8f84564292085c91c SHA1 4c00933e1ed60039fae091034d83e28d0890e87c SHA256 29feafd8b7177b65f8bd92553ac96779d9a91e3b7b4eeecfb0924eb7b6979587 size 300
-MD5 7c30ab7528b676a1a0c2737821599b29 metadata.xml 300
-RMD160 c85719cef743cf573efe73f8f84564292085c91c metadata.xml 300
-SHA256 29feafd8b7177b65f8bd92553ac96779d9a91e3b7b4eeecfb0924eb7b6979587 metadata.xml 300
+AUX vdr-analogtv-sane-c++.diff 1682 RMD160 1bbf8308f62245571444b053127674bc992dd723 SHA1 a2719c2a3460fc7bac1766f0c2ecfb5567e8d0cf SHA256 46bbccf5b72c601aacccfd00dbdcf8e2ed35a6bf924d3649e0c57ec6238332ce
+MD5 e46e02a8406effdc9313012734c435a3 files/vdr-analogtv-sane-c++.diff 1682
+RMD160 1bbf8308f62245571444b053127674bc992dd723 files/vdr-analogtv-sane-c++.diff 1682
+SHA256 46bbccf5b72c601aacccfd00dbdcf8e2ed35a6bf924d3649e0c57ec6238332ce files/vdr-analogtv-sane-c++.diff 1682
+DIST rte-09sep04-mp1e-gentoo.patch 47530 RMD160 310214a1fab00704f7f161827b7317d2589825be SHA1 763b8bd423d49911b1747aab5f18ed29185b5c59 SHA256 ce0883c6f63d1bffe1005b8aaa606299621507d9b66051ee3407e9bd856ed7b5
+DIST rte-09sep04.tar.bz2 445379 RMD160 5f1260d56d7e7a439f0fece3afef4964aa4099c4 SHA1 65a27e3b0c29a7d551a371d23ae8645ffe8fdc50 SHA256 e324523f34adb3e4e074e592237fee795b12f54210e0cee09b2eda5910cfd921
+DIST vdr-analogtv-0.9.37.tar.bz2 140955 RMD160 4a641c2cbb7ac54cc044bf4be85e59b853a9ec62 SHA1 5dc41a59f1c7404a1f84627b084b395dace1bde9 SHA256 5a29800121d33f0c02870554d25a55a64b4e34aab9e5afa4b65eb42df5b4b59a
+EBUILD vdr-analogtv-0.9.37-r1.ebuild 927 RMD160 857781a9cbc0695511f2b3ab9605826f2003958b SHA1 8c2aca4f9b3db95b2fbbf82a77c25683d8337704 SHA256 0c87388553d74397b68a3084a8f1a4004e2772eb4169046a755fdb1a8e5f3fde
+MD5 0731895cb564c137ef3a57a5f9e731af vdr-analogtv-0.9.37-r1.ebuild 927
+RMD160 857781a9cbc0695511f2b3ab9605826f2003958b vdr-analogtv-0.9.37-r1.ebuild 927
+SHA256 0c87388553d74397b68a3084a8f1a4004e2772eb4169046a755fdb1a8e5f3fde vdr-analogtv-0.9.37-r1.ebuild 927
+EBUILD vdr-analogtv-0.9.37.ebuild 1425 RMD160 5cd5903cf09f51597244edb844a3259011522415 SHA1 0d6552923bd3265c3972c2dd89d0b70fcaa8c00c SHA256 821a674297ef8f350ce59800194c25413758c05bc2c8ad55193d2054d4357c6c
+MD5 c9d21af0ebd8f562e5cdca686ce0c275 vdr-analogtv-0.9.37.ebuild 1425
+RMD160 5cd5903cf09f51597244edb844a3259011522415 vdr-analogtv-0.9.37.ebuild 1425
+SHA256 821a674297ef8f350ce59800194c25413758c05bc2c8ad55193d2054d4357c6c vdr-analogtv-0.9.37.ebuild 1425
+MISC ChangeLog 1395 RMD160 c0c8aa95c810c6a24726c096ca4ad94bf7effbb8 SHA1 cb0aa6935358ceff9c31a7d3b517daf6250aae8b SHA256 5860108b69c777438f042a3c9f536f2a2a83e97f72bee330df36980b0cdc2aae
+MD5 a30d6af71e92cb7ec94747262dfae396 ChangeLog 1395
+RMD160 c0c8aa95c810c6a24726c096ca4ad94bf7effbb8 ChangeLog 1395
+SHA256 5860108b69c777438f042a3c9f536f2a2a83e97f72bee330df36980b0cdc2aae ChangeLog 1395
+MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
+MD5 e0c01eee6ee7e11d5d597aee9f9a2852 metadata.xml 298
+RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf metadata.xml 298
+SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581 metadata.xml 298
MD5 a3a2bb500ad9c5636353dd16ddd7584a files/digest-vdr-analogtv-0.9.37 765
RMD160 7ce1c2065f09de581e73ec6ffe9a4efa7ddadb01 files/digest-vdr-analogtv-0.9.37 765
SHA256 a7e1944c5b68e2704f4ff09b4a3d513c475bea9a32cee358d0e737996866f81d files/digest-vdr-analogtv-0.9.37 765
+MD5 4836324c0a571713d95d59469e9d1ae4 files/digest-vdr-analogtv-0.9.37-r1 262
+RMD160 228a72d3c8d25a1df8f83bc0f29aaba2c4332103 files/digest-vdr-analogtv-0.9.37-r1 262
+SHA256 c1a0990ccbf602ed69ddb64192c382de52ff2a0abb5e97b697854bb071f304c9 files/digest-vdr-analogtv-0.9.37-r1 262
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
-iD8DBQFEadL8ZfSl1Kp5KmoRAl8gAJ9OQIrFBvHhe12zTHV0g0/tkTjajwCgtMwx
-IYg/kORXTGEFvcjUVjcIYp0=
-=hUyc
+iD8DBQFE4wJpt2vP6XvVdOcRApEQAJ4m7gvJsSRtHc5AFJtHaS2q6JRpOACgv9pK
+77xsbototChdbNZmptlY+V4=
+=k93o
-----END PGP SIGNATURE-----
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()
{