| 1 |
commit: 63bcfd14332970fd3581a5829281fbac01dea556 |
| 2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Dec 28 16:05:58 2016 +0000 |
| 4 |
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 28 16:47:44 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63bcfd14 |
| 7 |
|
| 8 |
media-libs/libdvb: remove unused patches |
| 9 |
|
| 10 |
.../libdvb-0.5.5.1-gentoo-file-collisions.patch | 129 --------------------- |
| 11 |
.../libdvb/files/libdvb-0.5.5.1-gentoo.patch | 33 ------ |
| 12 |
2 files changed, 162 deletions(-) |
| 13 |
|
| 14 |
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 |
| 15 |
deleted file mode 100644 |
| 16 |
index 408c62c..00000000 |
| 17 |
--- a/media-libs/libdvb/files/libdvb-0.5.5.1-gentoo-file-collisions.patch |
| 18 |
+++ /dev/null |
| 19 |
@@ -1,129 +0,0 @@ |
| 20 |
-diff -ru libdvb-0.5.5.1-orig/dvb-mpegtools/main.cc libdvb-0.5.5.1/dvb-mpegtools/main.cc |
| 21 |
---- libdvb-0.5.5.1-orig/dvb-mpegtools/main.cc 2006-01-21 14:16:09.919104500 +0100 |
| 22 |
-+++ libdvb-0.5.5.1/dvb-mpegtools/main.cc 2006-01-21 14:16:38.460888250 +0100 |
| 23 |
-@@ -54,7 +54,7 @@ |
| 24 |
- |
| 25 |
- #define PROGS 29 |
| 26 |
- |
| 27 |
--char *prognames[PROGS+1] = { "streamtype", // 0 |
| 28 |
-+char *prognames[PROGS+1] = { "streamtype_mpg", // 0 |
| 29 |
- "ts2pes", // 1 |
| 30 |
- "ps2vid", |
| 31 |
- "pes2aud_es", |
| 32 |
-@@ -63,7 +63,7 @@ |
| 33 |
- "pes2vid", |
| 34 |
- "tspids", |
| 35 |
- "pes2ts", |
| 36 |
-- "analyze", |
| 37 |
-+ "analyze_mpg", |
| 38 |
- "pes_demux", // 10 |
| 39 |
- "es_demux", |
| 40 |
- "ts_demux", |
| 41 |
-@@ -87,7 +87,7 @@ |
| 42 |
- }; |
| 43 |
- |
| 44 |
- |
| 45 |
--enum { streamtype_, // 0 |
| 46 |
-+enum { streamtype_mpg_, // 0 |
| 47 |
- ts2pes_, // 1 |
| 48 |
- ps2vid_, |
| 49 |
- pes2aud_es_, |
| 50 |
-@@ -96,7 +96,7 @@ |
| 51 |
- pes2vid_, |
| 52 |
- tspids_, |
| 53 |
- pes2ts_, |
| 54 |
-- analyze_, |
| 55 |
-+ analyze_mpg_, |
| 56 |
- pes_demux_, // 10 |
| 57 |
- es_demux_, |
| 58 |
- ts_demux_, |
| 59 |
-@@ -123,9 +123,9 @@ |
| 60 |
- { |
| 61 |
- switch(progn) { |
| 62 |
- |
| 63 |
-- case streamtype_: |
| 64 |
-- cerr << "usage: streamtype <filename>" << endl; |
| 65 |
-- cerr << "or streamtype < <filename> (or pipe)" << endl; |
| 66 |
-+ case streamtype_mpg_: |
| 67 |
-+ cerr << "usage: streamtype_mpg <filename>" << endl; |
| 68 |
-+ cerr << "or streamtype_mpg < <filename> (or pipe)" << endl; |
| 69 |
- break; |
| 70 |
- |
| 71 |
- case ts2pes_: |
| 72 |
-@@ -175,9 +175,9 @@ |
| 73 |
- cerr << " (or pipe)" << endl; |
| 74 |
- break; |
| 75 |
- |
| 76 |
-- case analyze_: |
| 77 |
-- cerr << "usage: analyze <filename>" << endl; |
| 78 |
-- cerr << " or analyze < <filename> (or pipe)" << endl; |
| 79 |
-+ case analyze_mpg_: |
| 80 |
-+ cerr << "usage: analyze_mpg <filename>" << endl; |
| 81 |
-+ cerr << " or analyze_mpg < <filename> (or pipe)" << endl; |
| 82 |
- break; |
| 83 |
- |
| 84 |
- case pes_demux_: |
| 85 |
-@@ -320,7 +320,7 @@ |
| 86 |
- } |
| 87 |
- |
| 88 |
- switch( progn ) { |
| 89 |
-- case streamtype_: { |
| 90 |
-+ case streamtype_mpg_: { |
| 91 |
- char *streams[4] = { "PS_STREAM", "TS_STREAM" |
| 92 |
- , "PES_STREAM"}; |
| 93 |
- char *tv_form[3] = {"DUNNO", "PAL", "NTSC"}; |
| 94 |
-@@ -426,7 +426,7 @@ |
| 95 |
- } |
| 96 |
- break; |
| 97 |
- |
| 98 |
-- case analyze_: |
| 99 |
-+ case analyze_mpg_: |
| 100 |
- if (fd == STDIN_FILENO) { |
| 101 |
- analyze(cin); |
| 102 |
- } else { |
| 103 |
-diff -ru libdvb-0.5.5.1-orig/dvb-mpegtools/Makefile libdvb-0.5.5.1/dvb-mpegtools/Makefile |
| 104 |
---- libdvb-0.5.5.1-orig/dvb-mpegtools/Makefile 2006-01-21 14:16:09.919104500 +0100 |
| 105 |
-+++ libdvb-0.5.5.1/dvb-mpegtools/Makefile 2006-01-21 14:16:38.460888250 +0100 |
| 106 |
-@@ -11,8 +11,8 @@ |
| 107 |
- CPPSRC = $(wildcard *.cpp) |
| 108 |
- CSRC = $(wildcard *.cc) |
| 109 |
- COBJ = $(notdir $(SRC:.c=.o)) |
| 110 |
--LINKS = streamtype ts2pes ps2vid pes2aud_es pes2aud pes2vid_es pes2vid \ |
| 111 |
-- tspids pes2ts analyze pes_demux es_demux ts_demux ts_es_demux \ |
| 112 |
-+LINKS = streamtype_mpg ts2pes ps2vid pes2aud_es pes2aud pes2vid_es pes2vid \ |
| 113 |
-+ tspids pes2ts analyze_mpg pes_demux es_demux ts_demux ts_es_demux \ |
| 114 |
- pesplot pes2ts2 pes_repack split_mpg cut_mpg ts2ps ts2es\ |
| 115 |
- insert_pat_pmt get_http extract_pes extract_pes_payload\ |
| 116 |
- change_aspect_1_1 change_aspect_4_3 change_aspect_16_9 \ |
| 117 |
-diff -ru libdvb-0.5.5.1-orig/dvb-mpegtools/README libdvb-0.5.5.1/dvb-mpegtools/README |
| 118 |
---- libdvb-0.5.5.1-orig/dvb-mpegtools/README 2006-01-21 14:16:09.923104750 +0100 |
| 119 |
-+++ libdvb-0.5.5.1/dvb-mpegtools/README 2006-01-21 14:24:06.020859000 +0100 |
| 120 |
-@@ -21,10 +21,10 @@ |
| 121 |
- get_http http://mymachine:8090/test.avi | mplayer - |
| 122 |
- usage: get_http <URL> |
| 123 |
- |
| 124 |
--streamtype |
| 125 |
-+streamtype_mpg (original name was streamtype, renamed to avoid name collisions) |
| 126 |
- tries to recognize the stream type and gives information about the stream. |
| 127 |
--usage: streamtype <filename> |
| 128 |
--or streamtype < <filename> (or pipe) |
| 129 |
-+usage: streamtype_mpg <filename> |
| 130 |
-+or streamtype_mpg < <filename> (or pipe) |
| 131 |
- |
| 132 |
- ts2ps |
| 133 |
- ts2pes |
| 134 |
-@@ -70,11 +70,11 @@ |
| 135 |
- usage: pes2ts2 <filename> <audio PID> <video PID> |
| 136 |
- or pes2ts2 < <filename> <audio PID> <video PID> (or pipe) |
| 137 |
- |
| 138 |
--analyze |
| 139 |
-+analyze_mpg (original name was analyze, renamed to avoid name collisions) |
| 140 |
- gives some information about a PS/PES stream and all the packets |
| 141 |
- contained therein. |
| 142 |
--usage: analyze <filename> |
| 143 |
--or analyze < <filename> (or pipe) |
| 144 |
-+usage: analyze_mpg <filename> |
| 145 |
-+or analyze_mpg < <filename> (or pipe) |
| 146 |
- |
| 147 |
- pes_demux |
| 148 |
- es_demux |
| 149 |
|
| 150 |
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 |
| 151 |
deleted file mode 100644 |
| 152 |
index 2820abf..00000000 |
| 153 |
--- a/media-libs/libdvb/files/libdvb-0.5.5.1-gentoo.patch |
| 154 |
+++ /dev/null |
| 155 |
@@ -1,33 +0,0 @@ |
| 156 |
---- Makefile.orig 2005-03-22 14:23:25.000000000 +0100 |
| 157 |
-+++ Makefile 2005-04-06 16:25:50.000000000 +0200 |
| 158 |
-@@ -11,7 +11,7 @@ |
| 159 |
- |
| 160 |
- |
| 161 |
- |
| 162 |
--main: $(DVB_LIBS) $(TEST_PROGS) $(DVB-MPEGTOOLS) |
| 163 |
-+main: $(DVB_LIBS) $(DVB-MPEGTOOLS) |
| 164 |
- |
| 165 |
- install: $(DVB_LIBS) $(HEADERS) |
| 166 |
- mkdir -p $(DESTDIR)$(PREFIX)/lib |
| 167 |
---- config.mk.orig 2005-03-22 14:23:25.000000000 +0100 |
| 168 |
-+++ config.mk 2005-04-06 16:27:14.000000000 +0200 |
| 169 |
-@@ -1,7 +1,7 @@ |
| 170 |
- # -*- makefile -*- |
| 171 |
- # |
| 172 |
- |
| 173 |
--PREFIX = /usr/local |
| 174 |
-+PREFIX = /usr |
| 175 |
- VERSION = 0.5.5.1 |
| 176 |
- CFLAGS=-O2 -Wall -g |
| 177 |
- INCLUDES=-I. -I../include |
| 178 |
---- dvb-mpegtools/Makefile.orig 2005-03-22 14:23:25.000000000 +0100 |
| 179 |
-+++ dvb-mpegtools/Makefile 2005-04-06 16:28:08.000000000 +0200 |
| 180 |
-@@ -62,7 +62,7 @@ |
| 181 |
- install -m 755 dvb-mpegtools_main $(DESTDIR)$(PREFIX)/bin/ |
| 182 |
- install -m 755 dvbaudio $(DESTDIR)$(PREFIX)/bin/ |
| 183 |
- install -m 755 show_dvb_image $(DESTDIR)$(PREFIX)/bin/ |
| 184 |
-- install -m 755 dia $(DESTDIR)$(PREFIX)/bin/ |
| 185 |
-+ install -m 755 dia $(DESTDIR)$(PREFIX)/bin/dia_dvb |
| 186 |
- for f in $(LINKS); do\ |
| 187 |
- (cd $(DESTDIR)$(PREFIX)/bin && ln -s -f dvb-mpegtools_main $$f) ;\ |
| 188 |
- done |
Archives