commit: 63bcfd14332970fd3581a5829281fbac01dea556
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail
<DOT> com>
AuthorDate: Wed Dec 28 16:05:58 2016 +0000
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Wed Dec 28 16:47:44 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63bcfd14
media-libs/libdvb: remove unused patches
.../libdvb-0.5.5.1-gentoo-file-collisions.patch | 129 ---------------------
.../libdvb/files/libdvb-0.5.5.1-gentoo.patch | 33 ------
2 files changed, 162 deletions(-)
diff --git
a/media-libs/libdvb/files/libdvb-0.5.5.1-gentoo-file-collisions.patch
b/media-libs/libdvb/files/libdvb-0.5.5.1-gentoo-file-collisions.patch
deleted file mode 100644
index 408c62c..00000000
--- a/media-libs/libdvb/files/libdvb-0.5.5.1-gentoo-file-collisions.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-diff -ru libdvb-0.5.5.1-orig/dvb-mpegtools/main.cc
libdvb-0.5.5.1/dvb-mpegtools/main.cc
---- libdvb-0.5.5.1-orig/dvb-mpegtools/main.cc 2006-01-21 14:16:09.919104500
+0100
-+++ libdvb-0.5.5.1/dvb-mpegtools/main.cc 2006-01-21 14:16:38.460888250
+0100
-@@ -54,7 +54,7 @@
-
- #define PROGS 29
-
--char *prognames[PROGS+1] = { "streamtype", // 0
-+char *prognames[PROGS+1] = { "streamtype_mpg", // 0
- "ts2pes", // 1
- "ps2vid",
- "pes2aud_es",
-@@ -63,7 +63,7 @@
- "pes2vid",
- "tspids",
- "pes2ts",
-- "analyze",
-+ "analyze_mpg",
- "pes_demux", // 10
- "es_demux",
- "ts_demux",
-@@ -87,7 +87,7 @@
- };
-
-
--enum { streamtype_, // 0
-+enum { streamtype_mpg_, // 0
- ts2pes_, // 1
- ps2vid_,
- pes2aud_es_,
-@@ -96,7 +96,7 @@
- pes2vid_,
- tspids_,
- pes2ts_,
-- analyze_,
-+ analyze_mpg_,
- pes_demux_, // 10
- es_demux_,
- ts_demux_,
-@@ -123,9 +123,9 @@
- {
- switch(progn) {
-
-- case streamtype_:
-- cerr << "usage: streamtype <filename>" << endl;
-- cerr << "or streamtype < <filename> (or pipe)" << endl;
-+ case streamtype_mpg_:
-+ cerr << "usage: streamtype_mpg <filename>" << endl;
-+ cerr << "or streamtype_mpg < <filename> (or pipe)" <<
endl;
- break;
-
- case ts2pes_:
-@@ -175,9 +175,9 @@
- cerr << " (or pipe)" << endl;
- break;
-
-- case analyze_:
-- cerr << "usage: analyze <filename>" << endl;
-- cerr << " or analyze < <filename> (or pipe)" << endl;
-+ case analyze_mpg_:
-+ cerr << "usage: analyze_mpg <filename>" << endl;
-+ cerr << " or analyze_mpg < <filename> (or pipe)" << endl;
- break;
-
- case pes_demux_:
-@@ -320,7 +320,7 @@
- }
-
- switch( progn ) {
-- case streamtype_: {
-+ case streamtype_mpg_: {
- char *streams[4] = { "PS_STREAM", "TS_STREAM"
- , "PES_STREAM"};
- char *tv_form[3] = {"DUNNO", "PAL", "NTSC"};
-@@ -426,7 +426,7 @@
- }
- break;
-
-- case analyze_:
-+ case analyze_mpg_:
- if (fd == STDIN_FILENO) {
- analyze(cin);
- } else {
-diff -ru libdvb-0.5.5.1-orig/dvb-mpegtools/Makefile
libdvb-0.5.5.1/dvb-mpegtools/Makefile
---- libdvb-0.5.5.1-orig/dvb-mpegtools/Makefile 2006-01-21 14:16:09.919104500
+0100
-+++ libdvb-0.5.5.1/dvb-mpegtools/Makefile 2006-01-21 14:16:38.460888250
+0100
-@@ -11,8 +11,8 @@
- CPPSRC = $(wildcard *.cpp)
- CSRC = $(wildcard *.cc)
- COBJ = $(notdir $(SRC:.c=.o))
--LINKS = streamtype ts2pes ps2vid pes2aud_es pes2aud pes2vid_es pes2vid \
-- tspids pes2ts analyze pes_demux es_demux ts_demux ts_es_demux \
-+LINKS = streamtype_mpg ts2pes ps2vid pes2aud_es pes2aud pes2vid_es pes2vid \
-+ tspids pes2ts analyze_mpg pes_demux es_demux ts_demux ts_es_demux \
- pesplot pes2ts2 pes_repack split_mpg cut_mpg ts2ps ts2es\
- insert_pat_pmt get_http extract_pes extract_pes_payload\
- change_aspect_1_1 change_aspect_4_3 change_aspect_16_9 \
-diff -ru libdvb-0.5.5.1-orig/dvb-mpegtools/README
libdvb-0.5.5.1/dvb-mpegtools/README
---- libdvb-0.5.5.1-orig/dvb-mpegtools/README 2006-01-21 14:16:09.923104750
+0100
-+++ libdvb-0.5.5.1/dvb-mpegtools/README 2006-01-21 14:24:06.020859000
+0100
-@@ -21,10 +21,10 @@
- get_http http://mymachine:8090/test.avi | mplayer -
- usage: get_http <URL>
-
--streamtype
-+streamtype_mpg (original name was streamtype, renamed to avoid name
collisions)
- tries to recognize the stream type and gives information about the stream.
--usage: streamtype <filename>
--or streamtype < <filename> (or pipe)
-+usage: streamtype_mpg <filename>
-+or streamtype_mpg < <filename> (or pipe)
-
- ts2ps
- ts2pes
-@@ -70,11 +70,11 @@
- usage: pes2ts2 <filename> <audio PID> <video PID>
- or pes2ts2 < <filename> <audio PID> <video PID> (or pipe)
-
--analyze
-+analyze_mpg (original name was analyze, renamed to avoid name collisions)
- gives some information about a PS/PES stream and all the packets
- contained therein.
--usage: analyze <filename>
--or analyze < <filename> (or pipe)
-+usage: analyze_mpg <filename>
-+or analyze_mpg < <filename> (or pipe)
-
- pes_demux
- es_demux
diff --git a/media-libs/libdvb/files/libdvb-0.5.5.1-gentoo.patch
b/media-libs/libdvb/files/libdvb-0.5.5.1-gentoo.patch
deleted file mode 100644
index 2820abf..00000000
--- a/media-libs/libdvb/files/libdvb-0.5.5.1-gentoo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- Makefile.orig 2005-03-22 14:23:25.000000000 +0100
-+++ Makefile 2005-04-06 16:25:50.000000000 +0200
-@@ -11,7 +11,7 @@
-
-
-
--main: $(DVB_LIBS) $(TEST_PROGS) $(DVB-MPEGTOOLS)
-+main: $(DVB_LIBS) $(DVB-MPEGTOOLS)
-
- install: $(DVB_LIBS) $(HEADERS)
- mkdir -p $(DESTDIR)$(PREFIX)/lib
---- config.mk.orig 2005-03-22 14:23:25.000000000 +0100
-+++ config.mk 2005-04-06 16:27:14.000000000 +0200
-@@ -1,7 +1,7 @@
- # -*- makefile -*-
- #
-
--PREFIX = /usr/local
-+PREFIX = /usr
- VERSION = 0.5.5.1
- CFLAGS=-O2 -Wall -g
- INCLUDES=-I. -I../include
---- dvb-mpegtools/Makefile.orig 2005-03-22 14:23:25.000000000 +0100
-+++ dvb-mpegtools/Makefile 2005-04-06 16:28:08.000000000 +0200
-@@ -62,7 +62,7 @@
- install -m 755 dvb-mpegtools_main $(DESTDIR)$(PREFIX)/bin/
- install -m 755 dvbaudio $(DESTDIR)$(PREFIX)/bin/
- install -m 755 show_dvb_image $(DESTDIR)$(PREFIX)/bin/
-- install -m 755 dia $(DESTDIR)$(PREFIX)/bin/
-+ install -m 755 dia $(DESTDIR)$(PREFIX)/bin/dia_dvb
- for f in $(LINKS); do\
- (cd $(DESTDIR)$(PREFIX)/bin && ln -s -f dvb-mpegtools_main $$f)
;\
- done
