summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2007-07-31 20:25:16 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2007-07-31 20:25:16 +0000
commite435116e230416717fa25c10ef76539ca3500db2 (patch)
treec75c432b7234c019c02e7a018e55ef030584e9a7 /media-plugins/vdr-softdevice
parentVersion bump to 1.0.2 and removing older versions. Closing bug #186640. (diff)
downloadhistorical-e435116e230416717fa25c10ef76539ca3500db2.tar.gz
historical-e435116e230416717fa25c10ef76539ca3500db2.tar.bz2
historical-e435116e230416717fa25c10ef76539ca3500db2.zip
Solved audio problems with older recordings and similar stuff, Bug #175490.
Package-Manager: portage-2.1.3_rc9
Diffstat (limited to 'media-plugins/vdr-softdevice')
-rw-r--r--media-plugins/vdr-softdevice/ChangeLog9
-rw-r--r--media-plugins/vdr-softdevice/Manifest33
-rw-r--r--media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.4.0.20070711-r13
-rw-r--r--media-plugins/vdr-softdevice/files/patches-0.4.0/series1
-rw-r--r--media-plugins/vdr-softdevice/files/patches-0.4.0/stream-repacker.diff67
-rw-r--r--media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070711-r1.ebuild135
6 files changed, 236 insertions, 12 deletions
diff --git a/media-plugins/vdr-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog
index 838e0925c8fb..1f7c7a21a473 100644
--- a/media-plugins/vdr-softdevice/ChangeLog
+++ b/media-plugins/vdr-softdevice/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for media-plugins/vdr-softdevice
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.46 2007/07/29 10:41:07 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.47 2007/07/31 20:25:16 zzam Exp $
+
+*vdr-softdevice-0.4.0.20070711-r1 (31 Jul 2007)
+
+ 31 Jul 2007; Matthias Schwarzott <zzam@gentoo.org>
+ files/patches-0.4.0/series, +files/patches-0.4.0/stream-repacker.diff,
+ +vdr-softdevice-0.4.0.20070711-r1.ebuild:
+ Solved audio problems with older recordings and similar stuff, Bug #175490.
29 Jul 2007; Matthias Schwarzott <zzam@gentoo.org>
-vdr-softdevice-0.4.0.20070515.ebuild:
diff --git a/media-plugins/vdr-softdevice/Manifest b/media-plugins/vdr-softdevice/Manifest
index 6b49452a9937..87ac5a9e8176 100644
--- a/media-plugins/vdr-softdevice/Manifest
+++ b/media-plugins/vdr-softdevice/Manifest
@@ -9,10 +9,10 @@ AUX patches-0.4.0/new-ffmpeg-extern-c.diff 1526 RMD160 ff074327176d72b3e65b7f5f6
MD5 7bf1216f21e700d544bc8b10eba5fdc8 files/patches-0.4.0/new-ffmpeg-extern-c.diff 1526
RMD160 ff074327176d72b3e65b7f5f61c615c196d95d6d files/patches-0.4.0/new-ffmpeg-extern-c.diff 1526
SHA256 4840b91d58672a9f98a04d84fa68e5e74baab9728f31907ab47a55cdfd9d06b0 files/patches-0.4.0/new-ffmpeg-extern-c.diff 1526
-AUX patches-0.4.0/series 55 RMD160 d9de1a1c92f065663818a77d5886b97f7faed264 SHA1 3b247bea2d208d008c942209f7289c7c5a8f83b0 SHA256 98fab29d91bb08810758ce2074dc698c13edf719a88caeef5c8783fd6b7c3986
-MD5 2b91704acb6ebcdbf79da48d19c0d0db files/patches-0.4.0/series 55
-RMD160 d9de1a1c92f065663818a77d5886b97f7faed264 files/patches-0.4.0/series 55
-SHA256 98fab29d91bb08810758ce2074dc698c13edf719a88caeef5c8783fd6b7c3986 files/patches-0.4.0/series 55
+AUX patches-0.4.0/series 76 RMD160 01bec4d6bd0cb5f0d7b357cbd316ee7809b65162 SHA1 8b5e5e9bb9679308a4ecfeba1d4e2456d9c27758 SHA256 c3e0c3e9bd003abfea03fff629e339c95a9bd3a9ddeb1e29a6fbacd532c5b1ed
+MD5 6a027316719c2088e0e3abc16289c722 files/patches-0.4.0/series 76
+RMD160 01bec4d6bd0cb5f0d7b357cbd316ee7809b65162 files/patches-0.4.0/series 76
+SHA256 c3e0c3e9bd003abfea03fff629e339c95a9bd3a9ddeb1e29a6fbacd532c5b1ed files/patches-0.4.0/series 76
AUX patches-0.4.0/shm-fullscreen-parameter.diff 737 RMD160 b09e27d40bc733b05ed2f01d3026e37671ef9bea SHA1 93da236176add5a323737ea845054f2964188451 SHA256 2665dd3d2e6059ec61ad8707af7f2b532485d49c8771f5875e0343a7325b48eb
MD5 153b382d28f33fe46a3a6a52db33d89c files/patches-0.4.0/shm-fullscreen-parameter.diff 737
RMD160 b09e27d40bc733b05ed2f01d3026e37671ef9bea files/patches-0.4.0/shm-fullscreen-parameter.diff 737
@@ -21,6 +21,10 @@ AUX patches-0.4.0/shm-init-setupStore.diff 1241 RMD160 887c2173a3ce9bae7fb50d071
MD5 c6313688772a7da3c8075ed6efd92a2f files/patches-0.4.0/shm-init-setupStore.diff 1241
RMD160 887c2173a3ce9bae7fb50d0715f7934264dd7c68 files/patches-0.4.0/shm-init-setupStore.diff 1241
SHA256 228f11c303981d02e1ea31d4d1bc2d74245f7a361bb6c15e25f578e415fab385 files/patches-0.4.0/shm-init-setupStore.diff 1241
+AUX patches-0.4.0/stream-repacker.diff 2440 RMD160 0e0e7ffbf31f1b28918d623315f5a110a4025977 SHA1 2b4a7810b93240b5121c843d80d66572a7ff6d1b SHA256 2f2b86f7b0a1abcf3b8639a3b23fcf8450ca0b16928e9e069b3857004d1bff21
+MD5 247b27223732eb49da6138caba40af2a files/patches-0.4.0/stream-repacker.diff 2440
+RMD160 0e0e7ffbf31f1b28918d623315f5a110a4025977 files/patches-0.4.0/stream-repacker.diff 2440
+SHA256 2f2b86f7b0a1abcf3b8639a3b23fcf8450ca0b16928e9e069b3857004d1bff21 files/patches-0.4.0/stream-repacker.diff 2440
AUX rc-addon.sh 321 RMD160 b236a3ce160d66fd4b25ad8fe4239cbbe5cb0843 SHA1 02c5f2efad7a8a3a687d79dee998a3fffb0018ea SHA256 d6eaa97c313fca31920f7bcc6d060c3dac9c4ee2624bfff4b0c59fa4ff91153d
MD5 26cfa3f4b7bc6686fd5de981b896e7da files/rc-addon.sh 321
RMD160 b236a3ce160d66fd4b25ad8fe4239cbbe5cb0843 files/rc-addon.sh 321
@@ -85,6 +89,10 @@ EBUILD vdr-softdevice-0.3.1.20070410.ebuild 3638 RMD160 d5365fc4e2fc7399f329d645
MD5 4509190a930a80fc55671579ebc1eae1 vdr-softdevice-0.3.1.20070410.ebuild 3638
RMD160 d5365fc4e2fc7399f329d6453fea40486ff70eaa vdr-softdevice-0.3.1.20070410.ebuild 3638
SHA256 c46c6d92706fae0c1d782fd55eb3be4a29e5b51744ffc06ff156f5853f1e3a97 vdr-softdevice-0.3.1.20070410.ebuild 3638
+EBUILD vdr-softdevice-0.4.0.20070711-r1.ebuild 3608 RMD160 190617b4c9dacfb86d0f7299f728bdf17b4945a8 SHA1 cf356e23fc321e21ca1aa5b293d73c288603fb31 SHA256 b2f0bf2c7a398d53e0cc306707c94d1f2a28144dcc11bb7a115188e61592f91c
+MD5 30f106430060650c72abfe77e9174f19 vdr-softdevice-0.4.0.20070711-r1.ebuild 3608
+RMD160 190617b4c9dacfb86d0f7299f728bdf17b4945a8 vdr-softdevice-0.4.0.20070711-r1.ebuild 3608
+SHA256 b2f0bf2c7a398d53e0cc306707c94d1f2a28144dcc11bb7a115188e61592f91c vdr-softdevice-0.4.0.20070711-r1.ebuild 3608
EBUILD vdr-softdevice-0.4.0.20070711.ebuild 3561 RMD160 6deead0ca8c9838926534e078006554498c6d3ec SHA1 af0f98abe3630b3c536d25569af970befd9ea30c SHA256 42c902717a15ef99e6e1ce2111cf2df7f3b4b739aa67e421b9b0d666610aca22
MD5 321f991e7aa6e5114014715e550c8e5e vdr-softdevice-0.4.0.20070711.ebuild 3561
RMD160 6deead0ca8c9838926534e078006554498c6d3ec vdr-softdevice-0.4.0.20070711.ebuild 3561
@@ -93,10 +101,10 @@ EBUILD vdr-softdevice-0.4.0.ebuild 3598 RMD160 c5bb5e4d31f375a1a44539e166741aabd
MD5 86356bd346d87970bde622bf17bdd3d7 vdr-softdevice-0.4.0.ebuild 3598
RMD160 c5bb5e4d31f375a1a44539e166741aabd3cda7be vdr-softdevice-0.4.0.ebuild 3598
SHA256 ffc0f1c4cb95810cdea8571d90b39ddf68dcd7aea3b9b196e1b69ce44e871741 vdr-softdevice-0.4.0.ebuild 3598
-MISC ChangeLog 10734 RMD160 2a1ee8865ab049f7b38bb0a6b9c26c4b74206967 SHA1 c45af4455eb70fba784ea9b5cfc7b9d12e151ee0 SHA256 914da64b11c431c52984d66b9f31429a4c1205cbe42a305ec7660260ac9ea830
-MD5 e6e5927dfc3be71d56c88921bff6a457 ChangeLog 10734
-RMD160 2a1ee8865ab049f7b38bb0a6b9c26c4b74206967 ChangeLog 10734
-SHA256 914da64b11c431c52984d66b9f31429a4c1205cbe42a305ec7660260ac9ea830 ChangeLog 10734
+MISC ChangeLog 11032 RMD160 2b37c9d7063db690bdc4443674be2a32c43a701a SHA1 3c79c805a6bef641feb7cfd594e7d542d2be6ad3 SHA256 0dac04b6030672d29f01589360035e42322652eb4620be93166e2dfa80171683
+MD5 f7c88bcaaa3a79b9293f545357dd93cb ChangeLog 11032
+RMD160 2b37c9d7063db690bdc4443674be2a32c43a701a ChangeLog 11032
+SHA256 0dac04b6030672d29f01589360035e42322652eb4620be93166e2dfa80171683 ChangeLog 11032
MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
MD5 e0c01eee6ee7e11d5d597aee9f9a2852 metadata.xml 298
RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf metadata.xml 298
@@ -125,10 +133,13 @@ SHA256 b1ecc8de3b7507e2f708b8dedb8130374e2833fd5759595f8e169f342b4c6b31 files/di
MD5 bfc7a5ccc03b0e1844b240f20f39eb00 files/digest-vdr-softdevice-0.4.0.20070711 286
RMD160 14d95da8d015dab58c81f7f5cd669a7de0b82139 files/digest-vdr-softdevice-0.4.0.20070711 286
SHA256 5fba935e9d93ff6239e7a1628013928d97c0c16dc912671c0cb9f14a7a9dfea9 files/digest-vdr-softdevice-0.4.0.20070711 286
+MD5 bfc7a5ccc03b0e1844b240f20f39eb00 files/digest-vdr-softdevice-0.4.0.20070711-r1 286
+RMD160 14d95da8d015dab58c81f7f5cd669a7de0b82139 files/digest-vdr-softdevice-0.4.0.20070711-r1 286
+SHA256 5fba935e9d93ff6239e7a1628013928d97c0c16dc912671c0cb9f14a7a9dfea9 files/digest-vdr-softdevice-0.4.0.20070711-r1 286
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.5 (GNU/Linux)
-iD8DBQFGrG7Jt2vP6XvVdOcRAt8oAJ96GX5SRfCK6rWWS10XjMBGqwpM4ACffE8E
-EYXimJ0JNgupW+pcOOwqAh8=
-=P1PN
+iD8DBQFGr5q2t2vP6XvVdOcRAn1gAJ9MDmvAn6Owf8eEhbRnz3YmT4xkaQCfcQnp
+2GPomI5gW0XHRhbN83cEpQI=
+=YYjT
-----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.4.0.20070711-r1 b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.4.0.20070711-r1
new file mode 100644
index 000000000000..3eeecc3b1532
--- /dev/null
+++ b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.4.0.20070711-r1
@@ -0,0 +1,3 @@
+MD5 79ea86ce835afb2a2814dda089a150cb vdr-softdevice-cvs-20070711.tar.bz2 152000
+RMD160 23be2f95bbb3e4d649a3ade799c443c579f80b84 vdr-softdevice-cvs-20070711.tar.bz2 152000
+SHA256 6c869ae0c86fe42a24f767c40f538d07f70806474d7851643870b3a778b68c1a vdr-softdevice-cvs-20070711.tar.bz2 152000
diff --git a/media-plugins/vdr-softdevice/files/patches-0.4.0/series b/media-plugins/vdr-softdevice/files/patches-0.4.0/series
index 2e3227d1b560..4feeaefd5db2 100644
--- a/media-plugins/vdr-softdevice/files/patches-0.4.0/series
+++ b/media-plugins/vdr-softdevice/files/patches-0.4.0/series
@@ -1,2 +1,3 @@
shm-fullscreen-parameter.diff
shm-init-setupStore.diff
+stream-repacker.diff
diff --git a/media-plugins/vdr-softdevice/files/patches-0.4.0/stream-repacker.diff b/media-plugins/vdr-softdevice/files/patches-0.4.0/stream-repacker.diff
new file mode 100644
index 000000000000..cec716a4336c
--- /dev/null
+++ b/media-plugins/vdr-softdevice/files/patches-0.4.0/stream-repacker.diff
@@ -0,0 +1,67 @@
+Index: softdevice-cvs/mpeg2decoder.c
+===================================================================
+--- softdevice-cvs.orig/mpeg2decoder.c
++++ softdevice-cvs/mpeg2decoder.c
+@@ -174,7 +174,7 @@ void cStreamDecoder::Action()
+ freezeMode=false;
+ AVPacket *pkt;
+
+- while ( PacketQueue.Available() < 7 && active) {
++ while ( PacketQueue.Available() < 3 && active) {
+ BUFDEB("wait while loop packets %d StreamDecoder pid:%d type %d\n",
+ PacketQueue.Available(),getpid(),context->codec_type );
+ usleep(10000);
+@@ -1124,20 +1124,31 @@ void cMpeg2Decoder::Action()
+ usleep(50000);
+
+ BUFDEB("av_read_frame start\n");
+- //ret = av_read_frame(ic, &pkt);
+- ret = av_read_packet(ic, &pkt);
++ ret = av_read_frame(ic, &pkt);
++ //ret = av_read_packet(ic, &pkt);
+ if (ret < 0) {
+ BUFDEB("cMpeg2Decoder Stream Error!\n");
+ if (ThreadActive)
+ usleep(10000);
+ continue;
+ }
+- //av_dup_packet(&pkt);
++ av_dup_packet(&pkt);
+ PacketCount++;
+ BUFDEB("got packet from av_read_frame!\n");
+
++#if LIBAVFORMAT_BUILD > 4623
++ AVRational time_base;
++ time_base=ic->streams[pkt.stream_index]->time_base;
++ if ( pkt.pts != (int64_t) AV_NOPTS_VALUE ) {
++ pkt.pts=av_rescale(pkt.pts, AV_TIME_BASE* (int64_t)time_base.num, time_base.den)/100 ;
++ };
++
++ //printf("PTS: %lld new %lld num %d den %d\n",PTS,pkt.pts,
++ // time_base.num,time_base.den);
++#else
+ if ( pkt.pts != (int64_t) AV_NOPTS_VALUE )
+ pkt.pts/=9;
++#endif
+
+ QueuePacket(ic,pkt,packetMode);
+
+@@ -1193,9 +1204,6 @@ void cMpeg2Decoder::ResetDecoder(int Str
+ void cMpeg2Decoder::QueuePacket(const AVFormatContext *ic, AVPacket &pkt,
+ bool PacketMode)
+ {
+- BUFDEB("QueuePacket AudioIdx: %d VideoIdx %d pkt.stream_index: %d\n",
+- AudioIdx,VideoIdx,pkt.stream_index);
+-
+ if (!ic) {
+ fprintf(stderr,"Error: ic is null!\n");
+ av_free_packet(&pkt);
+@@ -1221,6 +1229,8 @@ void cMpeg2Decoder::QueuePacket(const AV
+ BUFDEB("Unknown packet type! Return;\n");
+ return;
+ };
++ BUFDEB("QueuePacket AudioIdx: %d VideoIdx %d pkt.stream_index: %d, packet_type: %d\n",
++ AudioIdx,VideoIdx,pkt.stream_index,packet_type);
+
+ // check if there are new streams
+ if ( AudioIdx != DONT_PLAY && packet_type == CODEC_TYPE_AUDIO
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070711-r1.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070711-r1.ebuild
new file mode 100644
index 000000000000..e8d1bff4e9c5
--- /dev/null
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070711-r1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.4.0.20070711-r1.ebuild,v 1.1 2007/07/31 20:25:16 zzam Exp $
+
+inherit vdr-plugin versionator
+
+DESCRIPTION="VDR Plugin: Software output-Device"
+HOMEPAGE="http://softdevice.berlios.de/"
+
+# Detect snapshots
+SNAP_V="$(get_version_component_range 4)"
+if [[ "$SNAP_V" ]]; then
+ MY_P="${PN}-cvs-${SNAP_V}"
+ S="${WORKDIR}/${MY_P#vdr-}"
+ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
+ http://dev.gentoo.org/~zzam/distfiles/${MY_P}.tar.bz2"
+else
+ SRC_URI="mirror://berlios/${PN#vdr-}/${P}.tgz"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="xv fbcon directfb mmx mmxext xinerama"
+
+RDEPEND=">=media-video/vdr-1.3.36
+ >=media-video/ffmpeg-0.4.9_pre1
+ directfb? (
+ dev-libs/DirectFB
+ dev-libs/DFB++
+ )
+ media-libs/alsa-lib
+ xv? ( x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXv
+ xinerama? ( x11-libs/libXinerama )
+ )"
+
+DEPEND="${RDEPEND}
+ xv? ( x11-proto/xproto
+ x11-proto/xextproto
+ x11-libs/libXv
+ xinerama? ( x11-proto/xineramaproto )
+ )
+ fbcon? ( sys-kernel/linux-headers )
+ dev-util/pkgconfig"
+# Make sure the assembler USE flags are unmasked on amd64
+# Remove this once default-linux/amd64/2006.1 is deprecated
+DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )"
+
+PATCHES="
+ ${FILESDIR}/patches-0.4.0/shm-fullscreen-parameter.diff
+ ${FILESDIR}/patches-0.4.0/shm-init-setupStore.diff
+ ${FILESDIR}/patches-0.4.0/stream-repacker.diff"
+
+pkg_setup() {
+ vdr-plugin_pkg_setup
+
+ if use !xv && use !fbcon && use !directfb; then
+ ewarn "You need to set at least one of these use-flags: xv fbcon directfb"
+ die "no output-method enabled"
+ fi
+
+ COMPILE_SHM=0
+ if has_version ">=media-video/vdr-1.3.0"; then
+ if use xv; then
+ COMPILE_SHM=1
+ else
+ elog "SHM does only support xv at the moment"
+ fi
+ else
+ elog "SHM not supported on vdr-1.2"
+ fi
+ case ${COMPILE_SHM} in
+ 0) elog "SHM support will not be compiled." ;;
+ 1) elog "SHM support will be compiled." ;;
+ esac
+
+ # Check for ffmpeg relying on libtheora without pkg-config-file
+ # Bug #142250
+ if built_with_use media-video/ffmpeg theora && \
+ has_version "<media-libs/libtheora/libtheora-1.0_alpha4"; then
+
+ eerror "This package will not work when using ffmpeg with"
+ eerror "USE=\"theora\" combined with media-libs/libtheora"
+ eerror "older than version 1.0_alpha4."
+ eerror "Please update to at least media-libs/libtheora-1.0_alpha4."
+ die "Please update to at least media-libs/libtheora-1.0_alpha4."
+ fi
+}
+
+src_compile() {
+ local MYOPTS=""
+ MYOPTS="${MYOPTS} --disable-vidix"
+ use xv || MYOPTS="${MYOPTS} --disable-xv"
+ use fbcon || MYOPTS="${MYOPTS} --disable-fb"
+ use directfb || MYOPTS="${MYOPTS} --disable-dfb"
+
+ use mmx || MYOPTS="${MYOPTS} --disable-mmx"
+ use mmxext || MYOPTS="${MYOPTS} --disable-mmx2"
+
+ if use !mmx && use !mmxext; then
+ ewarn "${PN}"' does not compile with USE="-mmx -mmxext".'
+ ewarn 'Please enable at least one of these two use-flags.'
+ die "${PN}"' does not compile with USE="-mmx -mmxext".'
+ fi
+
+ use xinerama || MYOPTS="${MYOPTS} --disable-xinerama"
+
+ [[ ${COMPILE_SHM} == 1 ]] || MYOPTS="${MYOPTS} --disable-shm"
+
+ cd ${S}
+ elog configure ${MYOPTS}
+ ./configure ${MYOPTS} || die "configure failed"
+
+ vdr-plugin_src_compile
+}
+
+src_install() {
+ vdr-plugin_src_install
+
+ cd ${S}
+
+ insinto "${VDR_PLUGIN_DIR}"
+ doins libsoftdevice-*.so.*
+
+ if [[ "${COMPILE_SHM}" = "1" ]]; then
+ exeinto "/usr/bin"
+ doexe ShmClient
+ fi
+
+ insinto /usr/include/vdr-softdevice
+ doins *.h
+}