/[gentoo-x86]/media-libs/libdvb/files/libdvb-0.5.5.1-autotools.patch
Gentoo

Contents of /media-libs/libdvb/files/libdvb-0.5.5.1-autotools.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Wed May 14 12:10:14 2008 UTC (8 years, 3 months ago) by aballier
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +2 -1 lines
fix autotools patch to use AC_PROG_CXX so that it works with libtool 2.2 too
(Portage version: 2.1.5_rc10)

1 diff -urpN libdvb-0.5.5.1/autogen.sh libdvb-0.5.5.1.az/autogen.sh
2 --- libdvb-0.5.5.1/autogen.sh 1970-01-01 02:00:00.000000000 +0200
3 +++ libdvb-0.5.5.1.az/autogen.sh 2006-07-24 20:12:24.000000000 +0200
4 @@ -0,0 +1,9 @@
5 +#!/bin/bash
6 +
7 +aclocal-1.9 || exit 1
8 +libtoolize --automake -c -f || exit 1
9 +aclocal-1.9 || exit 1
10 +autoconf || exit 1
11 +autoheader || exit 1
12 +automake-1.9 -a -c || exit 1
13 +
14 diff -urpN libdvb-0.5.5.1/config.mk libdvb-0.5.5.1.az/config.mk
15 --- libdvb-0.5.5.1/config.mk 2005-03-22 15:23:25.000000000 +0200
16 +++ libdvb-0.5.5.1.az/config.mk 1970-01-01 02:00:00.000000000 +0200
17 @@ -1,10 +0,0 @@
18 -# -*- makefile -*-
19 -#
20 -
21 -PREFIX = /usr/local
22 -VERSION = 0.5.5.1
23 -CFLAGS=-O2 -Wall -g
24 -INCLUDES=-I. -I../include
25 -TEST_PROGS= merge_dvb conv satscan cam_set cam_test quickscan cam_menu dump_TS
26 -#CXX = g++-3.2
27 -#CC = gcc-3.2
28 diff -urpN libdvb-0.5.5.1/configure.ac libdvb-0.5.5.1.az/configure.ac
29 --- libdvb-0.5.5.1/configure.ac 1970-01-01 02:00:00.000000000 +0200
30 +++ libdvb-0.5.5.1.az/configure.ac 2006-07-24 21:08:47.000000000 +0200
31 @@ -0,0 +1,26 @@
32 +AC_PREREQ([2.59])
33 +AC_INIT([libdvb], [0.5.5.1], [mocm@metzlerbros.de])
34 +AM_INIT_AUTOMAKE
35 +AC_CONFIG_HEADER([config.h])
36 +
37 +dnl Checks for programs.
38 +AC_PROG_CC
39 +AC_PROG_CXX
40 +AC_ISC_POSIX
41 +AC_PROG_INSTALL
42 +AC_PROG_MAKE_SET
43 +AC_PROG_AWK
44 +
45 +AC_PROG_LIBTOOL
46 +
47 +AC_OUTPUT([
48 + Makefile
49 + include/Makefile
50 + libdvb/Makefile
51 + libdvbci/Makefile
52 + libdvbmpeg/Makefile
53 + dvb-mpegtools/Makefile
54 + sample_progs/Makefile
55 + samplerc/Makefile
56 +])
57 +
58 diff -urpN libdvb-0.5.5.1/dvb-mpegtools/Makefile libdvb-0.5.5.1.az/dvb-mpegtools/Makefile
59 --- libdvb-0.5.5.1/dvb-mpegtools/Makefile 2005-03-22 15:23:25.000000000 +0200
60 +++ libdvb-0.5.5.1.az/dvb-mpegtools/Makefile 1970-01-01 02:00:00.000000000 +0200
61 @@ -1,82 +0,0 @@
62 -
63 -include ../config.mk
64 -
65 -DCFLAGS = $(CFLAGS) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
66 -LIBS = -L../ -ldvbmpegtools
67 -MFLAG = -M
68 -MPLEXOBS = buffer.o inits.o interact.o systems.o domplex.o inptstrm.o \
69 - multplex.o timecode.o mplex.o bits.o
70 -
71 -SRC = $(wildcard *.c)
72 -CPPSRC = $(wildcard *.cpp)
73 -CSRC = $(wildcard *.cc)
74 -COBJ = $(notdir $(SRC:.c=.o))
75 -LINKS = streamtype ts2pes ps2vid pes2aud_es pes2aud pes2vid_es pes2vid \
76 - tspids pes2ts analyze pes_demux es_demux ts_demux ts_es_demux \
77 - pesplot pes2ts2 pes_repack split_mpg cut_mpg ts2ps ts2es\
78 - insert_pat_pmt get_http extract_pes extract_pes_payload\
79 - change_aspect_1_1 change_aspect_4_3 change_aspect_16_9 \
80 - change_aspect_221_1
81 -
82 -.PHONY: depend clean install uninstall
83 -
84 -
85 -all: dvb-mpegtools_main dvb-mplex links audiofilter dvbaudio show_dvb_image
86 -
87 -links: dvb-mpegtools_main
88 - for f in $(LINKS); do\
89 - ln -sf dvb-mpegtools_main $$f ;\
90 - done
91 -
92 -clean:
93 - - rm -f *.o .depend dvb-mpegtools_main dvb-mplex ctest *~ $(LINKS) ctest audiofilter show_dvb_image\
94 - dvbaudio
95 -
96 -dvb-mpegtools_main: main.o
97 - $(CXX) main.o $(LIBS) -o $@
98 -
99 -ctest: mainc.o
100 - $(CC) $(COBJ) -o $@
101 -
102 -dvb-mplex: $(MPLEXOBS)
103 - $(CXX) $(MPLEXOBS) $(LIBS) -o $@
104 -
105 -dvbaudio: dvbaudio.o
106 - $(CXX) dvbaudio.o $(LIBS) -ldvb -o $@
107 -
108 -audiofilter: audiofilter.o
109 - $(CXX) audiofilter.o -o $@
110 -
111 -%.o: %.cc
112 - $(CXX) -c $(DCFLAGS) $(INCLUDES) $(DEFINES) $<
113 -
114 -%.o: %.cpp
115 - $(CXX) -c $(DCFLAGS) $(INCLUDES) $(DEFINES) $<
116 -
117 -%.o: %.c
118 - $(CC) -c $(DCFLAGS) $(INCLUDES) $(DEFINES) $<
119 -
120 -install: dvb-mpegtools_main
121 - install -D -m 755 dvb-mplex $(DESTDIR)$(PREFIX)/bin/dvb-mplex
122 - install -m 755 audiofilter $(DESTDIR)$(PREFIX)/bin/
123 - install -m 755 dvb-mpegtools_main $(DESTDIR)$(PREFIX)/bin/
124 - install -m 755 dvbaudio $(DESTDIR)$(PREFIX)/bin/
125 - install -m 755 show_dvb_image $(DESTDIR)$(PREFIX)/bin/
126 - install -m 755 dia $(DESTDIR)$(PREFIX)/bin/
127 - for f in $(LINKS); do\
128 - (cd $(DESTDIR)$(PREFIX)/bin && ln -s -f dvb-mpegtools_main $$f) ;\
129 - done
130 -
131 -uninstall:
132 - for f in $(LINKS); do rm -f $(DESTDIR)$(PREFIX)/bin/$$f;done
133 - rm -f $(DESTDIR)$(PREFIX)/bin/dvb-mpegtools_main
134 - rm -f $(DESTDIR)$(PREFIX)/bin/dvbaudio
135 - rm -f $(DESTDIR)$(PREFIX)/bin/audiofilter
136 - rm -f $(DESTDIR)$(PREFIX)/lib/libdvbmpegtools
137 -
138 -.depend:
139 - $(CXX) $(DEFINES) $(MFLAG) $(SRC) $(CSRC) $(CPPSRC) $(INCLUDES)> .depend
140 -
141 -
142 -
143 -include .depend
144 diff -urpN libdvb-0.5.5.1/dvb-mpegtools/Makefile.am libdvb-0.5.5.1.az/dvb-mpegtools/Makefile.am
145 --- libdvb-0.5.5.1/dvb-mpegtools/Makefile.am 1970-01-01 02:00:00.000000000 +0200
146 +++ libdvb-0.5.5.1.az/dvb-mpegtools/Makefile.am 2006-07-24 21:44:55.000000000 +0200
147 @@ -0,0 +1,73 @@
148 +INCLUDES = -I$(top_srcdir)/include
149 +
150 +dist_bin_SCRIPTS = dia
151 +
152 +bin_PROGRAMS = \
153 + dvb-mpegtools_main \
154 + dvb-mplex \
155 + audiofilter \
156 + dvbaudio \
157 + show_dvb_image
158 +
159 +# Don't build currently
160 +#noinst_PROGRAMS = ctest
161 +
162 +LF_FLAGS = \
163 + -D_FILE_OFFSET_BITS=64 \
164 + -D_LARGEFILE_SOURCE \
165 + -D_LARGEFILE64_SOURCE
166 +
167 +LIBDVB = $(top_builddir)/libdvb/libdvb.la
168 +LIBDVBMPEG = $(top_builddir)/libdvbmpeg/libdvbmpegtools.la
169 +
170 +LINKS = \
171 + streamtype ts2pes ps2vid pes2aud_es pes2aud pes2vid_es pes2vid \
172 + tspids pes2ts analyze pes_demux es_demux ts_demux ts_es_demux \
173 + pesplot pes2ts2 pes_repack split_mpg cut_mpg ts2ps ts2es \
174 + insert_pat_pmt get_http extract_pes extract_pes_payload \
175 + change_aspect_1_1 change_aspect_4_3 change_aspect_16_9 \
176 + change_aspect_221_1
177 +
178 +dvb_mpegtools_main_LDADD = $(LIBDVBMPEG)
179 +dvb_mpegtools_main_CFLAGS = $(LF_FLAGS)
180 +dvb_mpegtools_main_SOURCES = main.cc
181 +
182 +dvb_mplex_LDADD = $(LIBDVBMPEG)
183 +dvb_mplex_CFLAGS = $(LF_FLAGS)
184 +dvb_mplex_SOURCES = \
185 + bits.cpp \
186 + domplex.cpp \
187 + inptstrm.cpp \
188 + mplex.cpp \
189 + multplex.cpp \
190 + timecode.cpp \
191 + buffer.cpp \
192 + inits.cpp \
193 + interact.cpp \
194 + common.h \
195 + consts.h \
196 + consts1.h \
197 + main.h \
198 + mplex.h \
199 + systems.cpp
200 +
201 +dvbaudio_LDADD = $(LIBDVB) $(LIBDVBMPEG)
202 +dvbaudio_CFLAGS = $(LF_FLAGS)
203 +dvbaudio_SOURCES = dvbaudio.cc
204 +
205 +audiofilter_CFLAGS = $(LF_FLAGS)
206 +audiofilter_SOURCES = audiofilter.c
207 +
208 +show_dvb_image_CFLAGS = $(LF_FLAGS)
209 +show_dvb_image_SOURCES = show_dvb_image.c
210 +
211 +# Don't build currently
212 +#ctest_CFLAGS = $(LF_FLAGS)
213 +#ctest_SOURCES = mainc.c
214 +
215 +install-exec-hook:
216 + @for x in $(LINKS) ; do \
217 + rm -f $(DESTDIR)$(bindir)/$$x; \
218 + $(LN_S) dvb-mpegtools_main $(DESTDIR)$(bindir)/$$x; \
219 + done
220 +
221 diff -urpN libdvb-0.5.5.1/include/Makefile.am libdvb-0.5.5.1.az/include/Makefile.am
222 --- libdvb-0.5.5.1/include/Makefile.am 1970-01-01 02:00:00.000000000 +0200
223 +++ libdvb-0.5.5.1.az/include/Makefile.am 2006-07-24 20:16:18.000000000 +0200
224 @@ -0,0 +1,13 @@
225 +dvbdir = $(pkgincludedir)
226 +dvb_HEADERS = \
227 + channel.h \
228 + ci.hh \
229 + cpptools.hh \
230 + ctools.h \
231 + devices.hh \
232 + DVB.hh \
233 + OSD.h \
234 + osd.hh \
235 + ringbuffy.h \
236 + transform.h
237 +
238 diff -urpN libdvb-0.5.5.1/libdvb/Makefile libdvb-0.5.5.1.az/libdvb/Makefile
239 --- libdvb-0.5.5.1/libdvb/Makefile 2005-03-22 15:23:25.000000000 +0200
240 +++ libdvb-0.5.5.1.az/libdvb/Makefile 1970-01-01 02:00:00.000000000 +0200
241 @@ -1,26 +0,0 @@
242 -
243 -include ../config.mk
244 -
245 -OBJS=devices.o DVB.o OSD.o
246 -LIBS=-L./ -lpthread
247 -DVB_LIBS=libdvb.a
248 -
249 -main: $(DVB_LIBS)
250 -
251 -libdvb.a: $(OBJS)
252 - ar -rcs libdvb.a $(OBJS)
253 -
254 -DVB.o: DVB.cc ../include/DVB.hh
255 - $(CXX) $(INCLUDES) $(CFLAGS) -c $<
256 -
257 -devices.o: devices.cc ../include/devices.hh
258 - $(CXX) $(INCLUDES) $(CFLAGS) -c $<
259 -
260 -.c.o:
261 - $(CC) $(INCLUDES) $(CFLAGS) -c $<
262 -
263 -.cc.o:
264 - $(CXX) $(INCLUDES) $(CFLAGS) -c $<
265 -
266 -clean:
267 - -rm -f *.o $(DVB_LIBS) *~
268 diff -urpN libdvb-0.5.5.1/libdvb/Makefile.am libdvb-0.5.5.1.az/libdvb/Makefile.am
269 --- libdvb-0.5.5.1/libdvb/Makefile.am 1970-01-01 02:00:00.000000000 +0200
270 +++ libdvb-0.5.5.1.az/libdvb/Makefile.am 2006-07-24 20:20:58.000000000 +0200
271 @@ -0,0 +1,12 @@
272 +AUTOMAKE_OPTIONS = foreign
273 +
274 +INCLUDES = -I$(top_srcdir)/include
275 +
276 +lib_LTLIBRARIES = libdvb.la
277 +
278 +libdvb_la_LDFLAGS = -lpthread
279 +libdvb_la_SOURCES = \
280 + devices.cc \
281 + DVB.cc \
282 + OSD.c
283 +
284 diff -urpN libdvb-0.5.5.1/libdvbci/Makefile libdvb-0.5.5.1.az/libdvbci/Makefile
285 --- libdvb-0.5.5.1/libdvbci/Makefile 2005-03-22 15:23:25.000000000 +0200
286 +++ libdvb-0.5.5.1.az/libdvbci/Makefile 1970-01-01 02:00:00.000000000 +0200
287 @@ -1,23 +0,0 @@
288 -
289 -include ../config.mk
290 -
291 -CI_OBJS=ci.o ci2.o
292 -LIBS=-L./ -lpthread
293 -DVB_LIBS=libdvbci.a
294 -
295 -main: $(DVB_LIBS)
296 -
297 -libdvbci.a: $(CI_OBJS)
298 - ar -rcs libdvbci.a $(CI_OBJS)
299 -
300 -ci.o: ci.cc ../include/ci.hh
301 - $(CXX) $(INCLUDES) $(CFLAGS) -c $<
302 -
303 -.c.o:
304 - $(CC) $(INCLUDES) $(CFLAGS) -c $<
305 -
306 -.cc.o:
307 - $(CXX) $(INCLUDES) $(CFLAGS) -c $<
308 -
309 -clean:
310 - -rm -f *.o $(DVB_LIBS) *~
311 diff -urpN libdvb-0.5.5.1/libdvbci/Makefile.am libdvb-0.5.5.1.az/libdvbci/Makefile.am
312 --- libdvb-0.5.5.1/libdvbci/Makefile.am 1970-01-01 02:00:00.000000000 +0200
313 +++ libdvb-0.5.5.1.az/libdvbci/Makefile.am 2006-07-24 20:21:19.000000000 +0200
314 @@ -0,0 +1,11 @@
315 +AUTOMAKE_OPTIONS = foreign
316 +
317 +INCLUDES = -I$(top_srcdir)/include
318 +
319 +lib_LTLIBRARIES = libdvbci.la
320 +
321 +libdvbci_la_LDFLAGS = -lpthread
322 +libdvbci_la_SOURCES = \
323 + ci2.c \
324 + ci.cc
325 +
326 diff -urpN libdvb-0.5.5.1/libdvbmpeg/Makefile libdvb-0.5.5.1.az/libdvbmpeg/Makefile
327 --- libdvb-0.5.5.1/libdvbmpeg/Makefile 2005-03-22 15:23:25.000000000 +0200
328 +++ libdvb-0.5.5.1.az/libdvbmpeg/Makefile 1970-01-01 02:00:00.000000000 +0200
329 @@ -1,36 +0,0 @@
330 -
331 -include ../config.mk
332 -
333 -DCFLAGS = $(CFLAGS) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
334 -MFLAG = -M
335 -OBJS = ctools.o ringbuffy.o transform.o cpptools.o
336 -SRC = $(wildcard *.c)
337 -CPPSRC = $(wildcard *.cpp)
338 -CSRC = $(wildcard *.cc)
339 -INCS = -I../include
340 -
341 -all: libdvbmpegtools.a
342 -
343 -.PHONY: depend clean install uninstall
344 -
345 -clean:
346 - - rm -f *.o *~ *.a .depend
347 -
348 -libdvbmpegtools.a: $(OBJS)
349 - ar -rcs libdvbmpegtools.a $(OBJS)
350 -
351 -%.o: %.cc
352 - $(CXX) -c $(DCFLAGS) $(INCLUDES) $(DEFINES) $<
353 -
354 -%.o: %.cpp
355 - $(CXX) -c $(DCFLAGS) $(INCLUDES) $(DEFINES) $<
356 -
357 -%.o: %.c
358 - $(CC) -c $(DCFLAGS) $(INCLUDES) $(DEFINES) $<
359 -
360 -.depend:
361 - $(CXX) $(DEFINES) $(MFLAG) $(SRC) $(CSRC) $(CPPSRC) $(INCLUDES)> .depend
362 -
363 -
364 -
365 -include .depend
366 diff -urpN libdvb-0.5.5.1/libdvbmpeg/Makefile.am libdvb-0.5.5.1.az/libdvbmpeg/Makefile.am
367 --- libdvb-0.5.5.1/libdvbmpeg/Makefile.am 1970-01-01 02:00:00.000000000 +0200
368 +++ libdvb-0.5.5.1.az/libdvbmpeg/Makefile.am 2006-07-24 20:21:30.000000000 +0200
369 @@ -0,0 +1,21 @@
370 +AUTOMAKE_OPTIONS = foreign
371 +
372 +INCLUDES = -I$(top_srcdir)/include
373 +
374 +lib_LTLIBRARIES = libdvbmpegtools.la
375 +
376 +LF_FLAGS = \
377 + -D_FILE_OFFSET_BITS=64 \
378 + -D_LARGEFILE_SOURCE \
379 + -D_LARGEFILE64_SOURCE
380 +
381 +libdvbmpegtools_la_CFLAGS = $(LF_FLAGS)
382 +libdvbmpegtools_la_CXXFLAGS = $(LF_FLAGS)
383 +libdvbmpegtools_la_LDFLAGS = -lpthread
384 +libdvbmpegtools_la_SOURCES = \
385 + cpptools.cc \
386 + ctools.c \
387 + remux.c \
388 + ringbuffy.c \
389 + transform.c
390 +
391 diff -urpN libdvb-0.5.5.1/Makefile libdvb-0.5.5.1.az/Makefile
392 --- libdvb-0.5.5.1/Makefile 2005-03-22 15:23:25.000000000 +0200
393 +++ libdvb-0.5.5.1.az/Makefile 1970-01-01 02:00:00.000000000 +0200
394 @@ -1,82 +0,0 @@
395 -
396 -SOURCEDIRS=include libdvb libdvbci libdvbmpeg sample_progs dvb-mpegtools samplerc
397 -DVB-MPEGTOOLS= dvb-mpegtools_main dvb-mplex audiofilter dvbaudio
398 -DVB_LIBS=libdvb.a libdvbci.a libdvbmpegtools.a
399 -HEADERS=include/DVB.hh include/ci.hh include/devices.hh include/channel.h include/ctools.h \
400 - include/transform.h include/ringbuffy.h include/cpptools.hh include/OSD.h \
401 - include/osd.hh
402 -
403 -RESOURCES=README
404 -include config.mk
405 -
406 -
407 -
408 -main: $(DVB_LIBS) $(TEST_PROGS) $(DVB-MPEGTOOLS)
409 -
410 -install: $(DVB_LIBS) $(HEADERS)
411 - mkdir -p $(DESTDIR)$(PREFIX)/lib
412 - install -m 644 $(DVB_LIBS) $(DESTDIR)$(PREFIX)/lib/
413 - mkdir -p $(DESTDIR)$(PREFIX)/include
414 - install -m 644 $(HEADERS) $(DESTDIR)$(PREFIX)/include/
415 - make -C dvb-mpegtools install
416 -
417 -uninstall:
418 - for i in $(DVB_LIBS); do rm -f $(DESTDIR)$(PREFIX)/lib/$$i;done
419 - for i in $(HEADERS); do rm -f $(DESTDIR)$(PREFIX)/$$i;done
420 - make -C dvb-mpegtools uninstall
421 -
422 -libdvb.a: libdvb/libdvb.a
423 - cp libdvb/libdvb.a .
424 -
425 -libdvbci.a: libdvbci/libdvbci.a
426 - cp libdvbci/libdvbci.a .
427 -
428 -libdvbmpegtools.a: libdvbmpeg/libdvbmpegtools.a
429 - cp libdvbmpeg/libdvbmpegtools.a .
430 -
431 -libdvb/libdvb.a:
432 - make -C libdvb main
433 -
434 -libdvbci/libdvbci.a:
435 - make -C libdvbci main
436 -
437 -libdvbmpeg/libdvbmpegtools.a:
438 - make -C libdvbmpeg libdvbmpegtools.a
439 -
440 -merge_dvb: libdvb.a sample_progs/merge.cc
441 -conv: libdvb.a sample_progs/conv.cc
442 -satscan: libdvb.a sample_progs/satscan.cc
443 -quickscan: libdvb.a sample_progs/quickscan.cc
444 -cam_set: libdvbci.a sample_progs/cam_set.cc
445 -cam_test: libdvb.a libdvbmpegtools.a sample_progs/cam_test.cc
446 - make -C sample_progs main
447 - for f in $(TEST_PROGS); do cp sample_progs/$$f . ; done
448 -
449 -dvb-mpegtools_main: libdvbmpegtools.a dvb-mpegtools/main.cc
450 -dvb-mplex: libdvbmpegtools.a dvb-mpegtools/mplex.cpp
451 -audiofilter: dvb-mpegtools/audiofilter.c
452 -dvbaudio: libdvb.a libdvbmpegtools.a dvb-mpegtools/dvbaudio.cc
453 - make -C dvb-mpegtools all
454 - for f in $(DVB-MPEGTOOLS); do cp dvb-mpegtools/$$f . ; done
455 -
456 -dvbs: libdvb.a libdvbmpegtools.a dvbserver/dvbs_main.cc
457 - make -C dvbserver dvbs_main
458 -
459 -
460 -clean:
461 - -rm -f libdvb-$(VERSION).tar.gz $(DVB_LIBS) $(TEST_PROGS) $(DVB-MPEGTOOLS) *~
462 - make -C libdvb clean
463 - make -C libdvbci clean
464 - make -C libdvbmpeg clean
465 - make -C sample_progs clean
466 - make -C dvb-mpegtools clean
467 - rm include/*~
468 -
469 -dist:
470 - mkdir libdvb-$(VERSION)
471 - for f in $(SOURCEDIRS); do mkdir libdvb-$(VERSION)/$$f;done
472 - cp -r $(SOURCEDIRS) libdvb-$(VERSION)
473 - for f in $(SOURCEDIRS); do rm -rf libdvb-$(VERSION)/$$f/CVS;done
474 - cp COPYING README Makefile config.mk libdvb-$(VERSION)
475 - tar zcf libdvb-$(VERSION).tar.gz libdvb-$(VERSION)
476 - rm -rf libdvb-$(VERSION)
477 diff -urpN libdvb-0.5.5.1/Makefile.am libdvb-0.5.5.1.az/Makefile.am
478 --- libdvb-0.5.5.1/Makefile.am 1970-01-01 02:00:00.000000000 +0200
479 +++ libdvb-0.5.5.1.az/Makefile.am 2006-07-24 21:07:35.000000000 +0200
480 @@ -0,0 +1,9 @@
481 +SUBDIRS = \
482 + include \
483 + libdvb \
484 + libdvbci \
485 + libdvbmpeg \
486 + dvb-mpegtools \
487 + sample_progs \
488 + samplerc
489 +
490 diff -urpN libdvb-0.5.5.1/sample_progs/cam_menu.cc libdvb-0.5.5.1.az/sample_progs/cam_menu.cc
491 --- libdvb-0.5.5.1/sample_progs/cam_menu.cc 2005-03-22 15:23:25.000000000 +0200
492 +++ libdvb-0.5.5.1.az/sample_progs/cam_menu.cc 2006-07-24 21:14:18.000000000 +0200
493 @@ -46,7 +46,7 @@ void reset_keypress()
494
495 void byebye(int i, void *f)
496 {
497 - int fd = (int) f;
498 + long fd = (long) f;
499
500 CamPacket cp(fd, CMENU_CLOSE, 0, NULL);
501 cp.psend();
502 diff -urpN libdvb-0.5.5.1/sample_progs/Makefile libdvb-0.5.5.1.az/sample_progs/Makefile
503 --- libdvb-0.5.5.1/sample_progs/Makefile 2005-03-22 15:23:25.000000000 +0200
504 +++ libdvb-0.5.5.1.az/sample_progs/Makefile 1970-01-01 02:00:00.000000000 +0200
505 @@ -1,48 +0,0 @@
506 -
507 -include ../config.mk
508 -
509 -LIBS=-L../
510 -DVB_LIBS=libdvb.a libdvbci.a
511 -HEADERS=DVB.hh ci.hh devices.hh channel.h
512 -SOURCES=Makefile $(HEADERS) DVB.cc ci.cc devices.cc OSD.h OSD.c osd.hh\
513 - merge.cc conv.cc satscan.cc cam_set.cc cam_test.cc quickscan.cc cam_menu.cc
514 -RESOURCES=README astrarc hotbirdrc
515 -
516 -main: $(TEST_PROGS)
517 -
518 -dump_TS: dump_TS.cc ../libdvb/libdvb.a ../include/DVB.hh
519 - $(CXX) $(LIBS) $(INCLUDES) $(CFLAGS) -o dump_TS dump_TS.cc -ldvb -ldvbmpegtools
520 -
521 -merge_dvb: merge.cc ../libdvb/libdvb.a ../include/DVB.hh
522 - $(CXX) $(LIBS) $(INCLUDES) $(CFLAGS) -o merge_dvb merge.cc -ldvb
523 -
524 -conv: conv.cc ../libdvb/libdvb.a ../include/DVB.hh
525 - $(CXX) $(LIBS) $(INCLUDES) $(CFLAGS) -o conv conv.cc -ldvb
526 -
527 -satscan: satscan.cc ../libdvb/libdvb.a ../include/DVB.hh
528 - $(CXX) $(LIBS) $(INCLUDES) $(CFLAGS) -o satscan satscan.cc -ldvb
529 -
530 -quickscan: quickscan.cc ../libdvb/libdvb.a ../include/DVB.hh
531 - $(CXX) $(LIBS) $(INCLUDES) $(CFLAGS) -o quickscan quickscan.cc -ldvb
532 -
533 -cam_set: cam_set.cc cam_menu.hh ../libdvbci/libdvbci.a ../include/ci.hh
534 - $(CXX) $(LIBS) $(INCLUDES) $(CFLAGS) -o cam_set cam_set.cc -ldvbci
535 -
536 -cam_test: cam_test.cc ../libdvb/libdvb.a ../include/DVB.hh ../include/ci.hh
537 - $(CXX) $(LIBS) $(INCLUDES) -o cam_test cam_test.cc -ldvb -ldvbmpegtools
538 -
539 -cam_menu: cam_menu.cc cam_menu.hh ../libdvb/libdvb.a ../include/DVB.hh
540 - $(CXX) $(LIBS) $(INCLUDES) -o cam_menu cam_menu.cc -ldvb
541 -
542 -status_check: status_check.c
543 - $(CC) $(INCLUDES) $(CFLAGS) -o status_check status_check.c
544 -
545 -.c.o:
546 - $(CC) $(INCLUDES) $(CFLAGS) -c $<
547 -
548 -.cc.o:
549 - $(CXX) $(INCLUDES) $(CFLAGS) -c $<
550 -
551 -clean:
552 - -rm -f *.o $(TEST_PROGS) *~
553 -
554 diff -urpN libdvb-0.5.5.1/sample_progs/Makefile.am libdvb-0.5.5.1.az/sample_progs/Makefile.am
555 --- libdvb-0.5.5.1/sample_progs/Makefile.am 1970-01-01 02:00:00.000000000 +0200
556 +++ libdvb-0.5.5.1.az/sample_progs/Makefile.am 2006-07-24 21:23:45.000000000 +0200
557 @@ -0,0 +1,45 @@
558 +INCLUDES = -I$(top_srcdir)/include
559 +
560 +noinst_PROGRAMS = \
561 + merge_dvb \
562 + conv \
563 + satscan \
564 + cam_set \
565 + cam_test \
566 + quickscan \
567 + cam_menu \
568 + dump_TS
569 +# Not building currently
570 +# status_check
571 +
572 +LIBDVB = $(top_builddir)/libdvb/libdvb.la
573 +LIBDVBCI = $(top_builddir)/libdvbci/libdvbci.la
574 +LIBDVBMPEG = $(top_builddir)/libdvbmpeg/libdvbmpegtools.la
575 +
576 +dump_TS_LDADD = $(LIBDVB) $(LIBDVBMPEG)
577 +dump_TS_SOURCES = dump_TS.cc
578 +
579 +merge_dvb_LDADD = $(LIBDVB)
580 +merge_dvb_SOURCES = merge.cc
581 +
582 +conv_LDADD = $(LIBDVB)
583 +conv_SOURCES = conv.cc
584 +
585 +satscan_LDADD = $(LIBDVB)
586 +satscan_SOURCES = satscan.cc
587 +
588 +quickscan_LDADD = $(LIBDVB)
589 +quickscan_SOURCES = quickscan.cc
590 +
591 +cam_set_LDADD = $(LIBDVBCI)
592 +cam_set_SOURCES = cam_set.cc cam_menu.hh
593 +
594 +cam_test_LDADD = $(LIBDVB) $(LIBDVBMPEG)
595 +cam_test_SOURCES = cam_test.cc
596 +
597 +cam_menu_LDADD = $(LIBDVB)
598 +cam_menu_SOURCES = cam_menu.cc cam_menu.hh
599 +
600 +# Not building currently
601 +#status_check_SOURCES = status_check.c
602 +
603 diff -urpN libdvb-0.5.5.1/samplerc/Makefile.am libdvb-0.5.5.1.az/samplerc/Makefile.am
604 --- libdvb-0.5.5.1/samplerc/Makefile.am 1970-01-01 02:00:00.000000000 +0200
605 +++ libdvb-0.5.5.1.az/samplerc/Makefile.am 2006-07-24 21:06:49.000000000 +0200
606 @@ -0,0 +1,11 @@
607 +EXTRA_DIST = \
608 + 28erc \
609 + astrarc \
610 + astra.xml \
611 + dvbt-koeln \
612 + hotbirdrc \
613 + nokia.dat \
614 + siriusrc \
615 + thorrc \
616 + w2-16.nokia
617 +

  ViewVC Help
Powered by ViewVC 1.1.20