Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libdvb/, media-libs/libdvb/files/
Date: Sat, 27 Jan 2018 23:18:08
Message-Id: 1517095074.7858f66eb94d88b4c0391a3c036f42c8ab3dcaaf.zlogene@gentoo
1 commit: 7858f66eb94d88b4c0391a3c036f42c8ab3dcaaf
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 27 23:15:54 2018 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 27 23:17:54 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7858f66e
7
8 media-libs/libdvb: remove last rited package
9
10 Closes: https://bugs.gentoo.org/451792
11
12 media-libs/libdvb/Manifest | 1 -
13 .../libdvb/files/libdvb-0.5.5.1-autotools.patch | 617 ---------------------
14 media-libs/libdvb/files/libdvb-0.5.5.1-gcc43.patch | 20 -
15 .../files/libdvb-0.5.5.1-rename-analyze.patch | 129 -----
16 media-libs/libdvb/libdvb-0.5.5.1-r3.ebuild | 49 --
17 media-libs/libdvb/metadata.xml | 5 -
18 6 files changed, 821 deletions(-)
19
20 diff --git a/media-libs/libdvb/Manifest b/media-libs/libdvb/Manifest
21 deleted file mode 100644
22 index 346b08c7818..00000000000
23 --- a/media-libs/libdvb/Manifest
24 +++ /dev/null
25 @@ -1 +0,0 @@
26 -DIST libdvb-0.5.5.1.tar.gz 312295 BLAKE2B 914014d09c6ccbba9f58de0a8fd6430be8e2148cf999259ee98ba17239b857e7a5c011412c751932390bfbfec516efebdb12c6fe0e434449ac05930c2ef4988a SHA512 6e776e9a01b0059e46124f8525c1b83951295bc695100386e3a488dfbe058ef074a96019bb77c5fd2c51b9baf67beb889af00914cfd796e2dd175f9423c449d4
27
28 diff --git a/media-libs/libdvb/files/libdvb-0.5.5.1-autotools.patch b/media-libs/libdvb/files/libdvb-0.5.5.1-autotools.patch
29 deleted file mode 100644
30 index bf3ded22d60..00000000000
31 --- a/media-libs/libdvb/files/libdvb-0.5.5.1-autotools.patch
32 +++ /dev/null
33 @@ -1,617 +0,0 @@
34 -diff -urpN libdvb-0.5.5.1/autogen.sh libdvb-0.5.5.1.az/autogen.sh
35 ---- libdvb-0.5.5.1/autogen.sh 1970-01-01 02:00:00.000000000 +0200
36 -+++ libdvb-0.5.5.1.az/autogen.sh 2006-07-24 20:12:24.000000000 +0200
37 -@@ -0,0 +1,9 @@
38 -+#!/bin/bash
39 -+
40 -+aclocal-1.9 || exit 1
41 -+libtoolize --automake -c -f || exit 1
42 -+aclocal-1.9 || exit 1
43 -+autoconf || exit 1
44 -+autoheader || exit 1
45 -+automake-1.9 -a -c || exit 1
46 -+
47 -diff -urpN libdvb-0.5.5.1/config.mk libdvb-0.5.5.1.az/config.mk
48 ---- libdvb-0.5.5.1/config.mk 2005-03-22 15:23:25.000000000 +0200
49 -+++ libdvb-0.5.5.1.az/config.mk 1970-01-01 02:00:00.000000000 +0200
50 -@@ -1,10 +0,0 @@
51 --# -*- makefile -*-
52 --#
53 --
54 --PREFIX = /usr/local
55 --VERSION = 0.5.5.1
56 --CFLAGS=-O2 -Wall -g
57 --INCLUDES=-I. -I../include
58 --TEST_PROGS= merge_dvb conv satscan cam_set cam_test quickscan cam_menu dump_TS
59 --#CXX = g++-3.2
60 --#CC = gcc-3.2
61 -diff -urpN libdvb-0.5.5.1/configure.ac libdvb-0.5.5.1.az/configure.ac
62 ---- libdvb-0.5.5.1/configure.ac 1970-01-01 02:00:00.000000000 +0200
63 -+++ libdvb-0.5.5.1.az/configure.ac 2006-07-24 21:08:47.000000000 +0200
64 -@@ -0,0 +1,26 @@
65 -+AC_PREREQ([2.59])
66 -+AC_INIT([libdvb], [0.5.5.1], [mocm@×××××××××××.de])
67 -+AM_INIT_AUTOMAKE
68 -+AC_CONFIG_HEADER([config.h])
69 -+
70 -+dnl Checks for programs.
71 -+AC_PROG_CC
72 -+AC_PROG_CXX
73 -+AC_ISC_POSIX
74 -+AC_PROG_INSTALL
75 -+AC_PROG_MAKE_SET
76 -+AC_PROG_AWK
77 -+
78 -+AC_PROG_LIBTOOL
79 -+
80 -+AC_OUTPUT([
81 -+ Makefile
82 -+ include/Makefile
83 -+ libdvb/Makefile
84 -+ libdvbci/Makefile
85 -+ libdvbmpeg/Makefile
86 -+ dvb-mpegtools/Makefile
87 -+ sample_progs/Makefile
88 -+ samplerc/Makefile
89 -+])
90 -+
91 -diff -urpN libdvb-0.5.5.1/dvb-mpegtools/Makefile libdvb-0.5.5.1.az/dvb-mpegtools/Makefile
92 ---- libdvb-0.5.5.1/dvb-mpegtools/Makefile 2005-03-22 15:23:25.000000000 +0200
93 -+++ libdvb-0.5.5.1.az/dvb-mpegtools/Makefile 1970-01-01 02:00:00.000000000 +0200
94 -@@ -1,82 +0,0 @@
95 --
96 --include ../config.mk
97 --
98 --DCFLAGS = $(CFLAGS) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
99 --LIBS = -L../ -ldvbmpegtools
100 --MFLAG = -M
101 --MPLEXOBS = buffer.o inits.o interact.o systems.o domplex.o inptstrm.o \
102 -- multplex.o timecode.o mplex.o bits.o
103 --
104 --SRC = $(wildcard *.c)
105 --CPPSRC = $(wildcard *.cpp)
106 --CSRC = $(wildcard *.cc)
107 --COBJ = $(notdir $(SRC:.c=.o))
108 --LINKS = streamtype ts2pes ps2vid pes2aud_es pes2aud pes2vid_es pes2vid \
109 -- tspids pes2ts analyze pes_demux es_demux ts_demux ts_es_demux \
110 -- pesplot pes2ts2 pes_repack split_mpg cut_mpg ts2ps ts2es\
111 -- insert_pat_pmt get_http extract_pes extract_pes_payload\
112 -- change_aspect_1_1 change_aspect_4_3 change_aspect_16_9 \
113 -- change_aspect_221_1
114 --
115 --.PHONY: depend clean install uninstall
116 --
117 --
118 --all: dvb-mpegtools_main dvb-mplex links audiofilter dvbaudio show_dvb_image
119 --
120 --links: dvb-mpegtools_main
121 -- for f in $(LINKS); do\
122 -- ln -sf dvb-mpegtools_main $$f ;\
123 -- done
124 --
125 --clean:
126 -- - rm -f *.o .depend dvb-mpegtools_main dvb-mplex ctest *~ $(LINKS) ctest audiofilter show_dvb_image\
127 -- dvbaudio
128 --
129 --dvb-mpegtools_main: main.o
130 -- $(CXX) main.o $(LIBS) -o $@
131 --
132 --ctest: mainc.o
133 -- $(CC) $(COBJ) -o $@
134 --
135 --dvb-mplex: $(MPLEXOBS)
136 -- $(CXX) $(MPLEXOBS) $(LIBS) -o $@
137 --
138 --dvbaudio: dvbaudio.o
139 -- $(CXX) dvbaudio.o $(LIBS) -ldvb -o $@
140 --
141 --audiofilter: audiofilter.o
142 -- $(CXX) audiofilter.o -o $@
143 --
144 --%.o: %.cc
145 -- $(CXX) -c $(DCFLAGS) $(INCLUDES) $(DEFINES) $<
146 --
147 --%.o: %.cpp
148 -- $(CXX) -c $(DCFLAGS) $(INCLUDES) $(DEFINES) $<
149 --
150 --%.o: %.c
151 -- $(CC) -c $(DCFLAGS) $(INCLUDES) $(DEFINES) $<
152 --
153 --install: dvb-mpegtools_main
154 -- install -D -m 755 dvb-mplex $(DESTDIR)$(PREFIX)/bin/dvb-mplex
155 -- install -m 755 audiofilter $(DESTDIR)$(PREFIX)/bin/
156 -- install -m 755 dvb-mpegtools_main $(DESTDIR)$(PREFIX)/bin/
157 -- install -m 755 dvbaudio $(DESTDIR)$(PREFIX)/bin/
158 -- install -m 755 show_dvb_image $(DESTDIR)$(PREFIX)/bin/
159 -- install -m 755 dia $(DESTDIR)$(PREFIX)/bin/
160 -- for f in $(LINKS); do\
161 -- (cd $(DESTDIR)$(PREFIX)/bin && ln -s -f dvb-mpegtools_main $$f) ;\
162 -- done
163 --
164 --uninstall:
165 -- for f in $(LINKS); do rm -f $(DESTDIR)$(PREFIX)/bin/$$f;done
166 -- rm -f $(DESTDIR)$(PREFIX)/bin/dvb-mpegtools_main
167 -- rm -f $(DESTDIR)$(PREFIX)/bin/dvbaudio
168 -- rm -f $(DESTDIR)$(PREFIX)/bin/audiofilter
169 -- rm -f $(DESTDIR)$(PREFIX)/lib/libdvbmpegtools
170 --
171 --.depend:
172 -- $(CXX) $(DEFINES) $(MFLAG) $(SRC) $(CSRC) $(CPPSRC) $(INCLUDES)> .depend
173 --
174 --
175 --
176 --include .depend
177 -diff -urpN libdvb-0.5.5.1/dvb-mpegtools/Makefile.am libdvb-0.5.5.1.az/dvb-mpegtools/Makefile.am
178 ---- libdvb-0.5.5.1/dvb-mpegtools/Makefile.am 1970-01-01 02:00:00.000000000 +0200
179 -+++ libdvb-0.5.5.1.az/dvb-mpegtools/Makefile.am 2006-07-24 21:44:55.000000000 +0200
180 -@@ -0,0 +1,73 @@
181 -+INCLUDES = -I$(top_srcdir)/include
182 -+
183 -+dist_bin_SCRIPTS = dia
184 -+
185 -+bin_PROGRAMS = \
186 -+ dvb-mpegtools_main \
187 -+ dvb-mplex \
188 -+ audiofilter \
189 -+ dvbaudio \
190 -+ show_dvb_image
191 -+
192 -+# Don't build currently
193 -+#noinst_PROGRAMS = ctest
194 -+
195 -+LF_FLAGS = \
196 -+ -D_FILE_OFFSET_BITS=64 \
197 -+ -D_LARGEFILE_SOURCE \
198 -+ -D_LARGEFILE64_SOURCE
199 -+
200 -+LIBDVB = $(top_builddir)/libdvb/libdvb.la
201 -+LIBDVBMPEG = $(top_builddir)/libdvbmpeg/libdvbmpegtools.la
202 -+
203 -+LINKS = \
204 -+ streamtype ts2pes ps2vid pes2aud_es pes2aud pes2vid_es pes2vid \
205 -+ tspids pes2ts analyze pes_demux es_demux ts_demux ts_es_demux \
206 -+ pesplot pes2ts2 pes_repack split_mpg cut_mpg ts2ps ts2es \
207 -+ insert_pat_pmt get_http extract_pes extract_pes_payload \
208 -+ change_aspect_1_1 change_aspect_4_3 change_aspect_16_9 \
209 -+ change_aspect_221_1
210 -+
211 -+dvb_mpegtools_main_LDADD = $(LIBDVBMPEG)
212 -+dvb_mpegtools_main_CFLAGS = $(LF_FLAGS)
213 -+dvb_mpegtools_main_SOURCES = main.cc
214 -+
215 -+dvb_mplex_LDADD = $(LIBDVBMPEG)
216 -+dvb_mplex_CFLAGS = $(LF_FLAGS)
217 -+dvb_mplex_SOURCES = \
218 -+ bits.cpp \
219 -+ domplex.cpp \
220 -+ inptstrm.cpp \
221 -+ mplex.cpp \
222 -+ multplex.cpp \
223 -+ timecode.cpp \
224 -+ buffer.cpp \
225 -+ inits.cpp \
226 -+ interact.cpp \
227 -+ common.h \
228 -+ consts.h \
229 -+ consts1.h \
230 -+ main.h \
231 -+ mplex.h \
232 -+ systems.cpp
233 -+
234 -+dvbaudio_LDADD = $(LIBDVB) $(LIBDVBMPEG)
235 -+dvbaudio_CFLAGS = $(LF_FLAGS)
236 -+dvbaudio_SOURCES = dvbaudio.cc
237 -+
238 -+audiofilter_CFLAGS = $(LF_FLAGS)
239 -+audiofilter_SOURCES = audiofilter.c
240 -+
241 -+show_dvb_image_CFLAGS = $(LF_FLAGS)
242 -+show_dvb_image_SOURCES = show_dvb_image.c
243 -+
244 -+# Don't build currently
245 -+#ctest_CFLAGS = $(LF_FLAGS)
246 -+#ctest_SOURCES = mainc.c
247 -+
248 -+install-exec-hook:
249 -+ @for x in $(LINKS) ; do \
250 -+ rm -f $(DESTDIR)$(bindir)/$$x; \
251 -+ $(LN_S) dvb-mpegtools_main $(DESTDIR)$(bindir)/$$x; \
252 -+ done
253 -+
254 -diff -urpN libdvb-0.5.5.1/include/Makefile.am libdvb-0.5.5.1.az/include/Makefile.am
255 ---- libdvb-0.5.5.1/include/Makefile.am 1970-01-01 02:00:00.000000000 +0200
256 -+++ libdvb-0.5.5.1.az/include/Makefile.am 2006-07-24 20:16:18.000000000 +0200
257 -@@ -0,0 +1,13 @@
258 -+dvbdir = $(pkgincludedir)
259 -+dvb_HEADERS = \
260 -+ channel.h \
261 -+ ci.hh \
262 -+ cpptools.hh \
263 -+ ctools.h \
264 -+ devices.hh \
265 -+ DVB.hh \
266 -+ OSD.h \
267 -+ osd.hh \
268 -+ ringbuffy.h \
269 -+ transform.h
270 -+
271 -diff -urpN libdvb-0.5.5.1/libdvb/Makefile libdvb-0.5.5.1.az/libdvb/Makefile
272 ---- libdvb-0.5.5.1/libdvb/Makefile 2005-03-22 15:23:25.000000000 +0200
273 -+++ libdvb-0.5.5.1.az/libdvb/Makefile 1970-01-01 02:00:00.000000000 +0200
274 -@@ -1,26 +0,0 @@
275 --
276 --include ../config.mk
277 --
278 --OBJS=devices.o DVB.o OSD.o
279 --LIBS=-L./ -lpthread
280 --DVB_LIBS=libdvb.a
281 --
282 --main: $(DVB_LIBS)
283 --
284 --libdvb.a: $(OBJS)
285 -- ar -rcs libdvb.a $(OBJS)
286 --
287 --DVB.o: DVB.cc ../include/DVB.hh
288 -- $(CXX) $(INCLUDES) $(CFLAGS) -c $<
289 --
290 --devices.o: devices.cc ../include/devices.hh
291 -- $(CXX) $(INCLUDES) $(CFLAGS) -c $<
292 --
293 --.c.o:
294 -- $(CC) $(INCLUDES) $(CFLAGS) -c $<
295 --
296 --.cc.o:
297 -- $(CXX) $(INCLUDES) $(CFLAGS) -c $<
298 --
299 --clean:
300 -- -rm -f *.o $(DVB_LIBS) *~
301 -diff -urpN libdvb-0.5.5.1/libdvb/Makefile.am libdvb-0.5.5.1.az/libdvb/Makefile.am
302 ---- libdvb-0.5.5.1/libdvb/Makefile.am 1970-01-01 02:00:00.000000000 +0200
303 -+++ libdvb-0.5.5.1.az/libdvb/Makefile.am 2006-07-24 20:20:58.000000000 +0200
304 -@@ -0,0 +1,12 @@
305 -+AUTOMAKE_OPTIONS = foreign
306 -+
307 -+INCLUDES = -I$(top_srcdir)/include
308 -+
309 -+lib_LTLIBRARIES = libdvb.la
310 -+
311 -+libdvb_la_LDFLAGS = -lpthread
312 -+libdvb_la_SOURCES = \
313 -+ devices.cc \
314 -+ DVB.cc \
315 -+ OSD.c
316 -+
317 -diff -urpN libdvb-0.5.5.1/libdvbci/Makefile libdvb-0.5.5.1.az/libdvbci/Makefile
318 ---- libdvb-0.5.5.1/libdvbci/Makefile 2005-03-22 15:23:25.000000000 +0200
319 -+++ libdvb-0.5.5.1.az/libdvbci/Makefile 1970-01-01 02:00:00.000000000 +0200
320 -@@ -1,23 +0,0 @@
321 --
322 --include ../config.mk
323 --
324 --CI_OBJS=ci.o ci2.o
325 --LIBS=-L./ -lpthread
326 --DVB_LIBS=libdvbci.a
327 --
328 --main: $(DVB_LIBS)
329 --
330 --libdvbci.a: $(CI_OBJS)
331 -- ar -rcs libdvbci.a $(CI_OBJS)
332 --
333 --ci.o: ci.cc ../include/ci.hh
334 -- $(CXX) $(INCLUDES) $(CFLAGS) -c $<
335 --
336 --.c.o:
337 -- $(CC) $(INCLUDES) $(CFLAGS) -c $<
338 --
339 --.cc.o:
340 -- $(CXX) $(INCLUDES) $(CFLAGS) -c $<
341 --
342 --clean:
343 -- -rm -f *.o $(DVB_LIBS) *~
344 -diff -urpN libdvb-0.5.5.1/libdvbci/Makefile.am libdvb-0.5.5.1.az/libdvbci/Makefile.am
345 ---- libdvb-0.5.5.1/libdvbci/Makefile.am 1970-01-01 02:00:00.000000000 +0200
346 -+++ libdvb-0.5.5.1.az/libdvbci/Makefile.am 2006-07-24 20:21:19.000000000 +0200
347 -@@ -0,0 +1,11 @@
348 -+AUTOMAKE_OPTIONS = foreign
349 -+
350 -+INCLUDES = -I$(top_srcdir)/include
351 -+
352 -+lib_LTLIBRARIES = libdvbci.la
353 -+
354 -+libdvbci_la_LDFLAGS = -lpthread
355 -+libdvbci_la_SOURCES = \
356 -+ ci2.c \
357 -+ ci.cc
358 -+
359 -diff -urpN libdvb-0.5.5.1/libdvbmpeg/Makefile libdvb-0.5.5.1.az/libdvbmpeg/Makefile
360 ---- libdvb-0.5.5.1/libdvbmpeg/Makefile 2005-03-22 15:23:25.000000000 +0200
361 -+++ libdvb-0.5.5.1.az/libdvbmpeg/Makefile 1970-01-01 02:00:00.000000000 +0200
362 -@@ -1,36 +0,0 @@
363 --
364 --include ../config.mk
365 --
366 --DCFLAGS = $(CFLAGS) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
367 --MFLAG = -M
368 --OBJS = ctools.o ringbuffy.o transform.o cpptools.o
369 --SRC = $(wildcard *.c)
370 --CPPSRC = $(wildcard *.cpp)
371 --CSRC = $(wildcard *.cc)
372 --INCS = -I../include
373 --
374 --all: libdvbmpegtools.a
375 --
376 --.PHONY: depend clean install uninstall
377 --
378 --clean:
379 -- - rm -f *.o *~ *.a .depend
380 --
381 --libdvbmpegtools.a: $(OBJS)
382 -- ar -rcs libdvbmpegtools.a $(OBJS)
383 --
384 --%.o: %.cc
385 -- $(CXX) -c $(DCFLAGS) $(INCLUDES) $(DEFINES) $<
386 --
387 --%.o: %.cpp
388 -- $(CXX) -c $(DCFLAGS) $(INCLUDES) $(DEFINES) $<
389 --
390 --%.o: %.c
391 -- $(CC) -c $(DCFLAGS) $(INCLUDES) $(DEFINES) $<
392 --
393 --.depend:
394 -- $(CXX) $(DEFINES) $(MFLAG) $(SRC) $(CSRC) $(CPPSRC) $(INCLUDES)> .depend
395 --
396 --
397 --
398 --include .depend
399 -diff -urpN libdvb-0.5.5.1/libdvbmpeg/Makefile.am libdvb-0.5.5.1.az/libdvbmpeg/Makefile.am
400 ---- libdvb-0.5.5.1/libdvbmpeg/Makefile.am 1970-01-01 02:00:00.000000000 +0200
401 -+++ libdvb-0.5.5.1.az/libdvbmpeg/Makefile.am 2006-07-24 20:21:30.000000000 +0200
402 -@@ -0,0 +1,21 @@
403 -+AUTOMAKE_OPTIONS = foreign
404 -+
405 -+INCLUDES = -I$(top_srcdir)/include
406 -+
407 -+lib_LTLIBRARIES = libdvbmpegtools.la
408 -+
409 -+LF_FLAGS = \
410 -+ -D_FILE_OFFSET_BITS=64 \
411 -+ -D_LARGEFILE_SOURCE \
412 -+ -D_LARGEFILE64_SOURCE
413 -+
414 -+libdvbmpegtools_la_CFLAGS = $(LF_FLAGS)
415 -+libdvbmpegtools_la_CXXFLAGS = $(LF_FLAGS)
416 -+libdvbmpegtools_la_LDFLAGS = -lpthread
417 -+libdvbmpegtools_la_SOURCES = \
418 -+ cpptools.cc \
419 -+ ctools.c \
420 -+ remux.c \
421 -+ ringbuffy.c \
422 -+ transform.c
423 -+
424 -diff -urpN libdvb-0.5.5.1/Makefile libdvb-0.5.5.1.az/Makefile
425 ---- libdvb-0.5.5.1/Makefile 2005-03-22 15:23:25.000000000 +0200
426 -+++ libdvb-0.5.5.1.az/Makefile 1970-01-01 02:00:00.000000000 +0200
427 -@@ -1,82 +0,0 @@
428 --
429 --SOURCEDIRS=include libdvb libdvbci libdvbmpeg sample_progs dvb-mpegtools samplerc
430 --DVB-MPEGTOOLS= dvb-mpegtools_main dvb-mplex audiofilter dvbaudio
431 --DVB_LIBS=libdvb.a libdvbci.a libdvbmpegtools.a
432 --HEADERS=include/DVB.hh include/ci.hh include/devices.hh include/channel.h include/ctools.h \
433 -- include/transform.h include/ringbuffy.h include/cpptools.hh include/OSD.h \
434 -- include/osd.hh
435 --
436 --RESOURCES=README
437 --include config.mk
438 --
439 --
440 --
441 --main: $(DVB_LIBS) $(TEST_PROGS) $(DVB-MPEGTOOLS)
442 --
443 --install: $(DVB_LIBS) $(HEADERS)
444 -- mkdir -p $(DESTDIR)$(PREFIX)/lib
445 -- install -m 644 $(DVB_LIBS) $(DESTDIR)$(PREFIX)/lib/
446 -- mkdir -p $(DESTDIR)$(PREFIX)/include
447 -- install -m 644 $(HEADERS) $(DESTDIR)$(PREFIX)/include/
448 -- make -C dvb-mpegtools install
449 --
450 --uninstall:
451 -- for i in $(DVB_LIBS); do rm -f $(DESTDIR)$(PREFIX)/lib/$$i;done
452 -- for i in $(HEADERS); do rm -f $(DESTDIR)$(PREFIX)/$$i;done
453 -- make -C dvb-mpegtools uninstall
454 --
455 --libdvb.a: libdvb/libdvb.a
456 -- cp libdvb/libdvb.a .
457 --
458 --libdvbci.a: libdvbci/libdvbci.a
459 -- cp libdvbci/libdvbci.a .
460 --
461 --libdvbmpegtools.a: libdvbmpeg/libdvbmpegtools.a
462 -- cp libdvbmpeg/libdvbmpegtools.a .
463 --
464 --libdvb/libdvb.a:
465 -- make -C libdvb main
466 --
467 --libdvbci/libdvbci.a:
468 -- make -C libdvbci main
469 --
470 --libdvbmpeg/libdvbmpegtools.a:
471 -- make -C libdvbmpeg libdvbmpegtools.a
472 --
473 --merge_dvb: libdvb.a sample_progs/merge.cc
474 --conv: libdvb.a sample_progs/conv.cc
475 --satscan: libdvb.a sample_progs/satscan.cc
476 --quickscan: libdvb.a sample_progs/quickscan.cc
477 --cam_set: libdvbci.a sample_progs/cam_set.cc
478 --cam_test: libdvb.a libdvbmpegtools.a sample_progs/cam_test.cc
479 -- make -C sample_progs main
480 -- for f in $(TEST_PROGS); do cp sample_progs/$$f . ; done
481 --
482 --dvb-mpegtools_main: libdvbmpegtools.a dvb-mpegtools/main.cc
483 --dvb-mplex: libdvbmpegtools.a dvb-mpegtools/mplex.cpp
484 --audiofilter: dvb-mpegtools/audiofilter.c
485 --dvbaudio: libdvb.a libdvbmpegtools.a dvb-mpegtools/dvbaudio.cc
486 -- make -C dvb-mpegtools all
487 -- for f in $(DVB-MPEGTOOLS); do cp dvb-mpegtools/$$f . ; done
488 --
489 --dvbs: libdvb.a libdvbmpegtools.a dvbserver/dvbs_main.cc
490 -- make -C dvbserver dvbs_main
491 --
492 --
493 --clean:
494 -- -rm -f libdvb-$(VERSION).tar.gz $(DVB_LIBS) $(TEST_PROGS) $(DVB-MPEGTOOLS) *~
495 -- make -C libdvb clean
496 -- make -C libdvbci clean
497 -- make -C libdvbmpeg clean
498 -- make -C sample_progs clean
499 -- make -C dvb-mpegtools clean
500 -- rm include/*~
501 --
502 --dist:
503 -- mkdir libdvb-$(VERSION)
504 -- for f in $(SOURCEDIRS); do mkdir libdvb-$(VERSION)/$$f;done
505 -- cp -r $(SOURCEDIRS) libdvb-$(VERSION)
506 -- for f in $(SOURCEDIRS); do rm -rf libdvb-$(VERSION)/$$f/CVS;done
507 -- cp COPYING README Makefile config.mk libdvb-$(VERSION)
508 -- tar zcf libdvb-$(VERSION).tar.gz libdvb-$(VERSION)
509 -- rm -rf libdvb-$(VERSION)
510 -diff -urpN libdvb-0.5.5.1/Makefile.am libdvb-0.5.5.1.az/Makefile.am
511 ---- libdvb-0.5.5.1/Makefile.am 1970-01-01 02:00:00.000000000 +0200
512 -+++ libdvb-0.5.5.1.az/Makefile.am 2006-07-24 21:07:35.000000000 +0200
513 -@@ -0,0 +1,9 @@
514 -+SUBDIRS = \
515 -+ include \
516 -+ libdvb \
517 -+ libdvbci \
518 -+ libdvbmpeg \
519 -+ dvb-mpegtools \
520 -+ sample_progs \
521 -+ samplerc
522 -+
523 -diff -urpN libdvb-0.5.5.1/sample_progs/cam_menu.cc libdvb-0.5.5.1.az/sample_progs/cam_menu.cc
524 ---- libdvb-0.5.5.1/sample_progs/cam_menu.cc 2005-03-22 15:23:25.000000000 +0200
525 -+++ libdvb-0.5.5.1.az/sample_progs/cam_menu.cc 2006-07-24 21:14:18.000000000 +0200
526 -@@ -46,7 +46,7 @@ void reset_keypress()
527 -
528 - void byebye(int i, void *f)
529 - {
530 -- int fd = (int) f;
531 -+ long fd = (long) f;
532 -
533 - CamPacket cp(fd, CMENU_CLOSE, 0, NULL);
534 - cp.psend();
535 -diff -urpN libdvb-0.5.5.1/sample_progs/Makefile libdvb-0.5.5.1.az/sample_progs/Makefile
536 ---- libdvb-0.5.5.1/sample_progs/Makefile 2005-03-22 15:23:25.000000000 +0200
537 -+++ libdvb-0.5.5.1.az/sample_progs/Makefile 1970-01-01 02:00:00.000000000 +0200
538 -@@ -1,48 +0,0 @@
539 --
540 --include ../config.mk
541 --
542 --LIBS=-L../
543 --DVB_LIBS=libdvb.a libdvbci.a
544 --HEADERS=DVB.hh ci.hh devices.hh channel.h
545 --SOURCES=Makefile $(HEADERS) DVB.cc ci.cc devices.cc OSD.h OSD.c osd.hh\
546 -- merge.cc conv.cc satscan.cc cam_set.cc cam_test.cc quickscan.cc cam_menu.cc
547 --RESOURCES=README astrarc hotbirdrc
548 --
549 --main: $(TEST_PROGS)
550 --
551 --dump_TS: dump_TS.cc ../libdvb/libdvb.a ../include/DVB.hh
552 -- $(CXX) $(LIBS) $(INCLUDES) $(CFLAGS) -o dump_TS dump_TS.cc -ldvb -ldvbmpegtools
553 --
554 --merge_dvb: merge.cc ../libdvb/libdvb.a ../include/DVB.hh
555 -- $(CXX) $(LIBS) $(INCLUDES) $(CFLAGS) -o merge_dvb merge.cc -ldvb
556 --
557 --conv: conv.cc ../libdvb/libdvb.a ../include/DVB.hh
558 -- $(CXX) $(LIBS) $(INCLUDES) $(CFLAGS) -o conv conv.cc -ldvb
559 --
560 --satscan: satscan.cc ../libdvb/libdvb.a ../include/DVB.hh
561 -- $(CXX) $(LIBS) $(INCLUDES) $(CFLAGS) -o satscan satscan.cc -ldvb
562 --
563 --quickscan: quickscan.cc ../libdvb/libdvb.a ../include/DVB.hh
564 -- $(CXX) $(LIBS) $(INCLUDES) $(CFLAGS) -o quickscan quickscan.cc -ldvb
565 --
566 --cam_set: cam_set.cc cam_menu.hh ../libdvbci/libdvbci.a ../include/ci.hh
567 -- $(CXX) $(LIBS) $(INCLUDES) $(CFLAGS) -o cam_set cam_set.cc -ldvbci
568 --
569 --cam_test: cam_test.cc ../libdvb/libdvb.a ../include/DVB.hh ../include/ci.hh
570 -- $(CXX) $(LIBS) $(INCLUDES) -o cam_test cam_test.cc -ldvb -ldvbmpegtools
571 --
572 --cam_menu: cam_menu.cc cam_menu.hh ../libdvb/libdvb.a ../include/DVB.hh
573 -- $(CXX) $(LIBS) $(INCLUDES) -o cam_menu cam_menu.cc -ldvb
574 --
575 --status_check: status_check.c
576 -- $(CC) $(INCLUDES) $(CFLAGS) -o status_check status_check.c
577 --
578 --.c.o:
579 -- $(CC) $(INCLUDES) $(CFLAGS) -c $<
580 --
581 --.cc.o:
582 -- $(CXX) $(INCLUDES) $(CFLAGS) -c $<
583 --
584 --clean:
585 -- -rm -f *.o $(TEST_PROGS) *~
586 --
587 -diff -urpN libdvb-0.5.5.1/sample_progs/Makefile.am libdvb-0.5.5.1.az/sample_progs/Makefile.am
588 ---- libdvb-0.5.5.1/sample_progs/Makefile.am 1970-01-01 02:00:00.000000000 +0200
589 -+++ libdvb-0.5.5.1.az/sample_progs/Makefile.am 2006-07-24 21:23:45.000000000 +0200
590 -@@ -0,0 +1,45 @@
591 -+INCLUDES = -I$(top_srcdir)/include
592 -+
593 -+noinst_PROGRAMS = \
594 -+ merge_dvb \
595 -+ conv \
596 -+ satscan \
597 -+ cam_set \
598 -+ cam_test \
599 -+ quickscan \
600 -+ cam_menu \
601 -+ dump_TS
602 -+# Not building currently
603 -+# status_check
604 -+
605 -+LIBDVB = $(top_builddir)/libdvb/libdvb.la
606 -+LIBDVBCI = $(top_builddir)/libdvbci/libdvbci.la
607 -+LIBDVBMPEG = $(top_builddir)/libdvbmpeg/libdvbmpegtools.la
608 -+
609 -+dump_TS_LDADD = $(LIBDVB) $(LIBDVBMPEG)
610 -+dump_TS_SOURCES = dump_TS.cc
611 -+
612 -+merge_dvb_LDADD = $(LIBDVB)
613 -+merge_dvb_SOURCES = merge.cc
614 -+
615 -+conv_LDADD = $(LIBDVB)
616 -+conv_SOURCES = conv.cc
617 -+
618 -+satscan_LDADD = $(LIBDVB)
619 -+satscan_SOURCES = satscan.cc
620 -+
621 -+quickscan_LDADD = $(LIBDVB)
622 -+quickscan_SOURCES = quickscan.cc
623 -+
624 -+cam_set_LDADD = $(LIBDVBCI)
625 -+cam_set_SOURCES = cam_set.cc cam_menu.hh
626 -+
627 -+cam_test_LDADD = $(LIBDVB) $(LIBDVBMPEG)
628 -+cam_test_SOURCES = cam_test.cc
629 -+
630 -+cam_menu_LDADD = $(LIBDVB)
631 -+cam_menu_SOURCES = cam_menu.cc cam_menu.hh
632 -+
633 -+# Not building currently
634 -+#status_check_SOURCES = status_check.c
635 -+
636 -diff -urpN libdvb-0.5.5.1/samplerc/Makefile.am libdvb-0.5.5.1.az/samplerc/Makefile.am
637 ---- libdvb-0.5.5.1/samplerc/Makefile.am 1970-01-01 02:00:00.000000000 +0200
638 -+++ libdvb-0.5.5.1.az/samplerc/Makefile.am 2006-07-24 21:06:49.000000000 +0200
639 -@@ -0,0 +1,11 @@
640 -+EXTRA_DIST = \
641 -+ 28erc \
642 -+ astrarc \
643 -+ astra.xml \
644 -+ dvbt-koeln \
645 -+ hotbirdrc \
646 -+ nokia.dat \
647 -+ siriusrc \
648 -+ thorrc \
649 -+ w2-16.nokia
650 -+
651
652 diff --git a/media-libs/libdvb/files/libdvb-0.5.5.1-gcc43.patch b/media-libs/libdvb/files/libdvb-0.5.5.1-gcc43.patch
653 deleted file mode 100644
654 index 8f9ea6b76d6..00000000000
655 --- a/media-libs/libdvb/files/libdvb-0.5.5.1-gcc43.patch
656 +++ /dev/null
657 @@ -1,20 +0,0 @@
658 ---- libdvb-0.5.5.1.orig/sample_progs/cam_menu.hh 2008-01-28 10:23:53.000000000 +0100
659 -+++ libdvb-0.5.5.1/sample_progs/cam_menu.hh 2008-01-28 10:22:55.000000000 +0100
660 -@@ -2,6 +2,7 @@
661 - * cam_menu.hh
662 - *
663 - */
664 -+#include <cstring>
665 - #include <sys/types.h>
666 - #include <sys/socket.h>
667 -
668 ---- libdvb-0.5.5.1.orig/libdvbmpeg/ringbuffy.c 2007-03-16 17:53:31.000000000 +0100
669 -+++ libdvb-0.5.5.1/libdvbmpeg/ringbuffy.c 2007-03-16 17:54:10.000000000 +0100
670 -@@ -19,6 +19,7 @@
671 - */
672 -
673 - #include "ringbuffy.h"
674 -+#include <string.h>
675 -
676 - int ring_init (ringbuffy *rbuf, int size)
677 - {
678
679 diff --git a/media-libs/libdvb/files/libdvb-0.5.5.1-rename-analyze.patch b/media-libs/libdvb/files/libdvb-0.5.5.1-rename-analyze.patch
680 deleted file mode 100644
681 index 23b4f22e44f..00000000000
682 --- a/media-libs/libdvb/files/libdvb-0.5.5.1-rename-analyze.patch
683 +++ /dev/null
684 @@ -1,129 +0,0 @@
685 -diff -ru libdvb-0.5.5.1-orig/dvb-mpegtools/main.cc libdvb-0.5.5.1/dvb-mpegtools/main.cc
686 ---- libdvb-0.5.5.1-orig/dvb-mpegtools/main.cc 2006-07-24 21:48:22.000000000 +0200
687 -+++ libdvb-0.5.5.1/dvb-mpegtools/main.cc 2006-07-24 21:50:03.000000000 +0200
688 -@@ -54,7 +54,7 @@
689 -
690 - #define PROGS 29
691 -
692 --char *prognames[PROGS+1] = { "streamtype", // 0
693 -+char *prognames[PROGS+1] = { "streamtype_mpg", // 0
694 - "ts2pes", // 1
695 - "ps2vid",
696 - "pes2aud_es",
697 -@@ -63,7 +63,7 @@
698 - "pes2vid",
699 - "tspids",
700 - "pes2ts",
701 -- "analyze",
702 -+ "analyze_mpg",
703 - "pes_demux", // 10
704 - "es_demux",
705 - "ts_demux",
706 -@@ -87,7 +87,7 @@
707 - };
708 -
709 -
710 --enum { streamtype_, // 0
711 -+enum { streamtype_mpg_, // 0
712 - ts2pes_, // 1
713 - ps2vid_,
714 - pes2aud_es_,
715 -@@ -96,7 +96,7 @@
716 - pes2vid_,
717 - tspids_,
718 - pes2ts_,
719 -- analyze_,
720 -+ analyze_mpg_,
721 - pes_demux_, // 10
722 - es_demux_,
723 - ts_demux_,
724 -@@ -123,9 +123,9 @@
725 - {
726 - switch(progn) {
727 -
728 -- case streamtype_:
729 -- cerr << "usage: streamtype <filename>" << endl;
730 -- cerr << "or streamtype < <filename> (or pipe)" << endl;
731 -+ case streamtype_mpg_:
732 -+ cerr << "usage: streamtype_mpg <filename>" << endl;
733 -+ cerr << "or streamtype_mpg < <filename> (or pipe)" << endl;
734 - break;
735 -
736 - case ts2pes_:
737 -@@ -175,9 +175,9 @@
738 - cerr << " (or pipe)" << endl;
739 - break;
740 -
741 -- case analyze_:
742 -- cerr << "usage: analyze <filename>" << endl;
743 -- cerr << " or analyze < <filename> (or pipe)" << endl;
744 -+ case analyze_mpg_:
745 -+ cerr << "usage: analyze_mpg <filename>" << endl;
746 -+ cerr << " or analyze_mpg < <filename> (or pipe)" << endl;
747 - break;
748 -
749 - case pes_demux_:
750 -@@ -320,7 +320,7 @@
751 - }
752 -
753 - switch( progn ) {
754 -- case streamtype_: {
755 -+ case streamtype_mpg_: {
756 - char *streams[4] = { "PS_STREAM", "TS_STREAM"
757 - , "PES_STREAM"};
758 - char *tv_form[3] = {"DUNNO", "PAL", "NTSC"};
759 -@@ -426,7 +426,7 @@
760 - }
761 - break;
762 -
763 -- case analyze_:
764 -+ case analyze_mpg_:
765 - if (fd == STDIN_FILENO) {
766 - analyze(cin);
767 - } else {
768 -diff -ru libdvb-0.5.5.1-orig/dvb-mpegtools/Makefile.am libdvb-0.5.5.1/dvb-mpegtools/Makefile.am
769 ---- libdvb-0.5.5.1-orig/dvb-mpegtools/Makefile.am 2006-07-24 21:48:22.000000000 +0200
770 -+++ libdvb-0.5.5.1/dvb-mpegtools/Makefile.am 2006-07-24 22:04:56.000000000 +0200
771 -@@ -21,8 +21,8 @@
772 - LIBDVBMPEG = $(top_builddir)/libdvbmpeg/libdvbmpegtools.la
773 -
774 - LINKS = \
775 -- streamtype ts2pes ps2vid pes2aud_es pes2aud pes2vid_es pes2vid \
776 -- tspids pes2ts analyze pes_demux es_demux ts_demux ts_es_demux \
777 -+ streamtype_mpg ts2pes ps2vid pes2aud_es pes2aud pes2vid_es pes2vid \
778 -+ tspids pes2ts analyze_mpg pes_demux es_demux ts_demux ts_es_demux \
779 - pesplot pes2ts2 pes_repack split_mpg cut_mpg ts2ps ts2es \
780 - insert_pat_pmt get_http extract_pes extract_pes_payload \
781 - change_aspect_1_1 change_aspect_4_3 change_aspect_16_9 \
782 -diff -ru libdvb-0.5.5.1-orig/dvb-mpegtools/README libdvb-0.5.5.1/dvb-mpegtools/README
783 ---- libdvb-0.5.5.1-orig/dvb-mpegtools/README 2006-07-24 21:48:22.000000000 +0200
784 -+++ libdvb-0.5.5.1/dvb-mpegtools/README 2006-07-24 21:50:03.000000000 +0200
785 -@@ -21,10 +21,10 @@
786 - get_http http://mymachine:8090/test.avi | mplayer -
787 - usage: get_http <URL>
788 -
789 --streamtype
790 -+streamtype_mpg (original name was streamtype, renamed to avoid name collisions)
791 - tries to recognize the stream type and gives information about the stream.
792 --usage: streamtype <filename>
793 --or streamtype < <filename> (or pipe)
794 -+usage: streamtype_mpg <filename>
795 -+or streamtype_mpg < <filename> (or pipe)
796 -
797 - ts2ps
798 - ts2pes
799 -@@ -70,11 +70,11 @@
800 - usage: pes2ts2 <filename> <audio PID> <video PID>
801 - or pes2ts2 < <filename> <audio PID> <video PID> (or pipe)
802 -
803 --analyze
804 -+analyze_mpg (original name was analyze, renamed to avoid name collisions)
805 - gives some information about a PS/PES stream and all the packets
806 - contained therein.
807 --usage: analyze <filename>
808 --or analyze < <filename> (or pipe)
809 -+usage: analyze_mpg <filename>
810 -+or analyze_mpg < <filename> (or pipe)
811 -
812 - pes_demux
813 - es_demux
814
815 diff --git a/media-libs/libdvb/libdvb-0.5.5.1-r3.ebuild b/media-libs/libdvb/libdvb-0.5.5.1-r3.ebuild
816 deleted file mode 100644
817 index 12b5f20a8f6..00000000000
818 --- a/media-libs/libdvb/libdvb-0.5.5.1-r3.ebuild
819 +++ /dev/null
820 @@ -1,49 +0,0 @@
821 -# Copyright 1999-2017 Gentoo Foundation
822 -# Distributed under the terms of the GNU General Public License v2
823 -
824 -inherit eutils autotools
825 -
826 -DESCRIPTION="libdvb package with CAM library. libdvbmpegtools, and dvb-mpegtools"
827 -HOMEPAGE="http://www.metzlerbros.org/dvb/"
828 -SRC_URI="http://www.metzlerbros.org/dvb/${P}.tar.gz"
829 -
830 -LICENSE="GPL-2"
831 -SLOT="0"
832 -KEYWORDS="amd64 ppc x86"
833 -IUSE="doc"
834 -
835 -DEPEND="virtual/linuxtv-dvb-headers"
836 -
837 -src_unpack() {
838 - unpack ${A}
839 - cd "${S}"
840 -
841 - epatch "${FILESDIR}/${P}-autotools.patch"
842 - epatch "${FILESDIR}/${P}-rename-analyze.patch"
843 - epatch "${FILESDIR}/${P}-gcc43.patch"
844 -
845 - eautoreconf
846 -}
847 -
848 -src_install() {
849 - #einstall DESTDIR="${D}" || die "Install problem"
850 - insinto /usr/$(get_libdir)
851 - make DESTDIR="${D}" PREFIX=/usr LIBDIR=$(get_libdir) install || die "Problem at make install"
852 -
853 - cd "${D}"/usr/bin
854 - mv dia dia_dvb
855 -
856 - cd "${S}"
857 - if use doc; then
858 - insinto "/usr/share/doc/${PF}/sample_progs"
859 - doins sample_progs/*
860 - insinto "/usr/share/doc/${PF}/samplerc"
861 - doins samplerc/*
862 - fi
863 -
864 - elog "The script called 'dia' has been installed as dia_dvb"
865 - elog "so that it doesn't overwrite the binary of app-office/dia."
866 - elog "analyze has been renamed to analyze_mpg."
867 -
868 - dodoc README
869 -}
870
871 diff --git a/media-libs/libdvb/metadata.xml b/media-libs/libdvb/metadata.xml
872 deleted file mode 100644
873 index 6f49eba8f49..00000000000
874 --- a/media-libs/libdvb/metadata.xml
875 +++ /dev/null
876 @@ -1,5 +0,0 @@
877 -<?xml version="1.0" encoding="UTF-8"?>
878 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
879 -<pkgmetadata>
880 -<!-- maintainer-needed -->
881 -</pkgmetadata>