| diff -urpN libdvb-0.5.5.1/autogen.sh libdvb-0.5.5.1.az/autogen.sh |
| --- libdvb-0.5.5.1/autogen.sh 1970-01-01 02:00:00.000000000 +0200 |
| +++ libdvb-0.5.5.1.az/autogen.sh 2006-07-24 20:12:24.000000000 +0200 |
| @@ -0,0 +1,9 @@ |
| +#!/bin/bash |
| + |
| +aclocal-1.9 || exit 1 |
| +libtoolize --automake -c -f || exit 1 |
| +aclocal-1.9 || exit 1 |
| +autoconf || exit 1 |
| +autoheader || exit 1 |
| +automake-1.9 -a -c || exit 1 |
| + |
| diff -urpN libdvb-0.5.5.1/config.mk libdvb-0.5.5.1.az/config.mk |
| --- libdvb-0.5.5.1/config.mk 2005-03-22 15:23:25.000000000 +0200 |
| +++ libdvb-0.5.5.1.az/config.mk 1970-01-01 02:00:00.000000000 +0200 |
| @@ -1,10 +0,0 @@ |
| -# -*- makefile -*- |
| -# |
| - |
| -PREFIX = /usr/local |
| -VERSION = 0.5.5.1 |
| -CFLAGS=-O2 -Wall -g |
| -INCLUDES=-I. -I../include |
| -TEST_PROGS= merge_dvb conv satscan cam_set cam_test quickscan cam_menu dump_TS |
| -#CXX = g++-3.2 |
| -#CC = gcc-3.2 |
| diff -urpN libdvb-0.5.5.1/configure.ac libdvb-0.5.5.1.az/configure.ac |
| --- libdvb-0.5.5.1/configure.ac 1970-01-01 02:00:00.000000000 +0200 |
| +++ libdvb-0.5.5.1.az/configure.ac 2006-07-24 21:08:47.000000000 +0200 |
| @@ -0,0 +1,26 @@ |
| +AC_PREREQ([2.59]) |
| +AC_INIT([libdvb], [0.5.5.1], [mocm@metzlerbros.de]) |
| +AM_INIT_AUTOMAKE |
| +AC_CONFIG_HEADER([config.h]) |
| + |
| +dnl Checks for programs. |
| +AC_PROG_CC |
| +AC_PROG_CXX |
| +AC_ISC_POSIX |
| +AC_PROG_INSTALL |
| +AC_PROG_MAKE_SET |
| +AC_PROG_AWK |
| + |
| +AC_PROG_LIBTOOL |
| + |
| +AC_OUTPUT([ |
| + Makefile |
| + include/Makefile |
| + libdvb/Makefile |
| + libdvbci/Makefile |
| + libdvbmpeg/Makefile |
| + dvb-mpegtools/Makefile |
| + sample_progs/Makefile |
| + samplerc/Makefile |
| +]) |
| + |
| diff -urpN libdvb-0.5.5.1/dvb-mpegtools/Makefile libdvb-0.5.5.1.az/dvb-mpegtools/Makefile |
| --- libdvb-0.5.5.1/dvb-mpegtools/Makefile 2005-03-22 15:23:25.000000000 +0200 |
| +++ libdvb-0.5.5.1.az/dvb-mpegtools/Makefile 1970-01-01 02:00:00.000000000 +0200 |
| @@ -1,82 +0,0 @@ |
| - |
| -include ../config.mk |
| - |
| -DCFLAGS = $(CFLAGS) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE |
| -LIBS = -L../ -ldvbmpegtools |
| -MFLAG = -M |
| -MPLEXOBS = buffer.o inits.o interact.o systems.o domplex.o inptstrm.o \ |
| - multplex.o timecode.o mplex.o bits.o |
| - |
| -SRC = $(wildcard *.c) |
| -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 \ |
| - 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 \ |
| - change_aspect_221_1 |
| - |
| -.PHONY: depend clean install uninstall |
| - |
| - |
| -all: dvb-mpegtools_main dvb-mplex links audiofilter dvbaudio show_dvb_image |
| - |
| -links: dvb-mpegtools_main |
| - for f in $(LINKS); do\ |
| - ln -sf dvb-mpegtools_main $$f ;\ |
| - done |
| - |
| -clean: |
| - - rm -f *.o .depend dvb-mpegtools_main dvb-mplex ctest *~ $(LINKS) ctest audiofilter show_dvb_image\ |
| - dvbaudio |
| - |
| -dvb-mpegtools_main: main.o |
| - $(CXX) main.o $(LIBS) -o $@ |
| - |
| -ctest: mainc.o |
| - $(CC) $(COBJ) -o $@ |
| - |
| -dvb-mplex: $(MPLEXOBS) |
| - $(CXX) $(MPLEXOBS) $(LIBS) -o $@ |
| - |
| -dvbaudio: dvbaudio.o |
| - $(CXX) dvbaudio.o $(LIBS) -ldvb -o $@ |
| - |
| -audiofilter: audiofilter.o |
| - $(CXX) audiofilter.o -o $@ |
| - |
| -%.o: %.cc |
| - $(CXX) -c $(DCFLAGS) $(INCLUDES) $(DEFINES) $< |
| - |
| -%.o: %.cpp |
| - $(CXX) -c $(DCFLAGS) $(INCLUDES) $(DEFINES) $< |
| - |
| -%.o: %.c |
| - $(CC) -c $(DCFLAGS) $(INCLUDES) $(DEFINES) $< |
| - |
| -install: dvb-mpegtools_main |
| - install -D -m 755 dvb-mplex $(DESTDIR)$(PREFIX)/bin/dvb-mplex |
| - install -m 755 audiofilter $(DESTDIR)$(PREFIX)/bin/ |
| - 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/ |
| - for f in $(LINKS); do\ |
| - (cd $(DESTDIR)$(PREFIX)/bin && ln -s -f dvb-mpegtools_main $$f) ;\ |
| - done |
| - |
| -uninstall: |
| - for f in $(LINKS); do rm -f $(DESTDIR)$(PREFIX)/bin/$$f;done |
| - rm -f $(DESTDIR)$(PREFIX)/bin/dvb-mpegtools_main |
| - rm -f $(DESTDIR)$(PREFIX)/bin/dvbaudio |
| - rm -f $(DESTDIR)$(PREFIX)/bin/audiofilter |
| - rm -f $(DESTDIR)$(PREFIX)/lib/libdvbmpegtools |
| - |
| -.depend: |
| - $(CXX) $(DEFINES) $(MFLAG) $(SRC) $(CSRC) $(CPPSRC) $(INCLUDES)> .depend |
| - |
| - |
| - |
| -include .depend |
| diff -urpN libdvb-0.5.5.1/dvb-mpegtools/Makefile.am libdvb-0.5.5.1.az/dvb-mpegtools/Makefile.am |
| --- libdvb-0.5.5.1/dvb-mpegtools/Makefile.am 1970-01-01 02:00:00.000000000 +0200 |
| +++ libdvb-0.5.5.1.az/dvb-mpegtools/Makefile.am 2006-07-24 21:44:55.000000000 +0200 |
| @@ -0,0 +1,73 @@ |
| +INCLUDES = -I$(top_srcdir)/include |
| + |
| +dist_bin_SCRIPTS = dia |
| + |
| +bin_PROGRAMS = \ |
| + dvb-mpegtools_main \ |
| + dvb-mplex \ |
| + audiofilter \ |
| + dvbaudio \ |
| + show_dvb_image |
| + |
| +# Don't build currently |
| +#noinst_PROGRAMS = ctest |
| + |
| +LF_FLAGS = \ |
| + -D_FILE_OFFSET_BITS=64 \ |
| + -D_LARGEFILE_SOURCE \ |
| + -D_LARGEFILE64_SOURCE |
| + |
| +LIBDVB = $(top_builddir)/libdvb/libdvb.la |
| +LIBDVBMPEG = $(top_builddir)/libdvbmpeg/libdvbmpegtools.la |
| + |
| +LINKS = \ |
| + streamtype ts2pes ps2vid pes2aud_es pes2aud pes2vid_es pes2vid \ |
| + tspids pes2ts analyze 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 \ |
| + change_aspect_221_1 |
| + |
| +dvb_mpegtools_main_LDADD = $(LIBDVBMPEG) |
| +dvb_mpegtools_main_CFLAGS = $(LF_FLAGS) |
| +dvb_mpegtools_main_SOURCES = main.cc |
| + |
| +dvb_mplex_LDADD = $(LIBDVBMPEG) |
| +dvb_mplex_CFLAGS = $(LF_FLAGS) |
| +dvb_mplex_SOURCES = \ |
| + bits.cpp \ |
| + domplex.cpp \ |
| + inptstrm.cpp \ |
| + mplex.cpp \ |
| + multplex.cpp \ |
| + timecode.cpp \ |
| + buffer.cpp \ |
| + inits.cpp \ |
| + interact.cpp \ |
| + common.h \ |
| + consts.h \ |
| + consts1.h \ |
| + main.h \ |
| + mplex.h \ |
| + systems.cpp |
| + |
| +dvbaudio_LDADD = $(LIBDVB) $(LIBDVBMPEG) |
| +dvbaudio_CFLAGS = $(LF_FLAGS) |
| +dvbaudio_SOURCES = dvbaudio.cc |
| + |
| +audiofilter_CFLAGS = $(LF_FLAGS) |
| +audiofilter_SOURCES = audiofilter.c |
| + |
| +show_dvb_image_CFLAGS = $(LF_FLAGS) |
| +show_dvb_image_SOURCES = show_dvb_image.c |
| + |
| +# Don't build currently |
| +#ctest_CFLAGS = $(LF_FLAGS) |
| +#ctest_SOURCES = mainc.c |
| + |
| +install-exec-hook: |
| + @for x in $(LINKS) ; do \ |
| + rm -f $(DESTDIR)$(bindir)/$$x; \ |
| + $(LN_S) dvb-mpegtools_main $(DESTDIR)$(bindir)/$$x; \ |
| + done |
| + |
| diff -urpN libdvb-0.5.5.1/include/Makefile.am libdvb-0.5.5.1.az/include/Makefile.am |
| --- libdvb-0.5.5.1/include/Makefile.am 1970-01-01 02:00:00.000000000 +0200 |
| +++ libdvb-0.5.5.1.az/include/Makefile.am 2006-07-24 20:16:18.000000000 +0200 |
| @@ -0,0 +1,13 @@ |
| +dvbdir = $(pkgincludedir) |
| +dvb_HEADERS = \ |
| + channel.h \ |
| + ci.hh \ |
| + cpptools.hh \ |
| + ctools.h \ |
| + devices.hh \ |
| + DVB.hh \ |
| + OSD.h \ |
| + osd.hh \ |
| + ringbuffy.h \ |
| + transform.h |
| + |
| diff -urpN libdvb-0.5.5.1/libdvb/Makefile libdvb-0.5.5.1.az/libdvb/Makefile |
| --- libdvb-0.5.5.1/libdvb/Makefile 2005-03-22 15:23:25.000000000 +0200 |
| +++ libdvb-0.5.5.1.az/libdvb/Makefile 1970-01-01 02:00:00.000000000 +0200 |
| @@ -1,26 +0,0 @@ |
| - |
| -include ../config.mk |
| - |
| -OBJS=devices.o DVB.o OSD.o |
| -LIBS=-L./ -lpthread |
| -DVB_LIBS=libdvb.a |
| - |
| -main: $(DVB_LIBS) |
| - |
| -libdvb.a: $(OBJS) |
| - ar -rcs libdvb.a $(OBJS) |
| - |
| -DVB.o: DVB.cc ../include/DVB.hh |
| - $(CXX) $(INCLUDES) $(CFLAGS) -c $< |
| - |
| -devices.o: devices.cc ../include/devices.hh |
| - $(CXX) $(INCLUDES) $(CFLAGS) -c $< |
| - |
| -.c.o: |
| - $(CC) $(INCLUDES) $(CFLAGS) -c $< |
| - |
| -.cc.o: |
| - $(CXX) $(INCLUDES) $(CFLAGS) -c $< |
| - |
| -clean: |
| - -rm -f *.o $(DVB_LIBS) *~ |
| diff -urpN libdvb-0.5.5.1/libdvb/Makefile.am libdvb-0.5.5.1.az/libdvb/Makefile.am |
| --- libdvb-0.5.5.1/libdvb/Makefile.am 1970-01-01 02:00:00.000000000 +0200 |
| +++ libdvb-0.5.5.1.az/libdvb/Makefile.am 2006-07-24 20:20:58.000000000 +0200 |
| @@ -0,0 +1,12 @@ |
| +AUTOMAKE_OPTIONS = foreign |
| + |
| +INCLUDES = -I$(top_srcdir)/include |
| + |
| +lib_LTLIBRARIES = libdvb.la |
| + |
| +libdvb_la_LDFLAGS = -lpthread |
| +libdvb_la_SOURCES = \ |
| + devices.cc \ |
| + DVB.cc \ |
| + OSD.c |
| + |
| diff -urpN libdvb-0.5.5.1/libdvbci/Makefile libdvb-0.5.5.1.az/libdvbci/Makefile |
| --- libdvb-0.5.5.1/libdvbci/Makefile 2005-03-22 15:23:25.000000000 +0200 |
| +++ libdvb-0.5.5.1.az/libdvbci/Makefile 1970-01-01 02:00:00.000000000 +0200 |
| @@ -1,23 +0,0 @@ |
| - |
| -include ../config.mk |
| - |
| -CI_OBJS=ci.o ci2.o |
| -LIBS=-L./ -lpthread |
| -DVB_LIBS=libdvbci.a |
| - |
| -main: $(DVB_LIBS) |
| - |
| -libdvbci.a: $(CI_OBJS) |
| - ar -rcs libdvbci.a $(CI_OBJS) |
| - |
| -ci.o: ci.cc ../include/ci.hh |
| - $(CXX) $(INCLUDES) $(CFLAGS) -c $< |
| - |
| -.c.o: |
| - $(CC) $(INCLUDES) $(CFLAGS) -c $< |
| - |
| -.cc.o: |
| - $(CXX) $(INCLUDES) $(CFLAGS) -c $< |
| - |
| -clean: |
| - -rm -f *.o $(DVB_LIBS) *~ |
| diff -urpN libdvb-0.5.5.1/libdvbci/Makefile.am libdvb-0.5.5.1.az/libdvbci/Makefile.am |
| --- libdvb-0.5.5.1/libdvbci/Makefile.am 1970-01-01 02:00:00.000000000 +0200 |
| +++ libdvb-0.5.5.1.az/libdvbci/Makefile.am 2006-07-24 20:21:19.000000000 +0200 |
| @@ -0,0 +1,11 @@ |
| +AUTOMAKE_OPTIONS = foreign |
| + |
| +INCLUDES = -I$(top_srcdir)/include |
| + |
| +lib_LTLIBRARIES = libdvbci.la |
| + |
| +libdvbci_la_LDFLAGS = -lpthread |
| +libdvbci_la_SOURCES = \ |
| + ci2.c \ |
| + ci.cc |
| + |
| diff -urpN libdvb-0.5.5.1/libdvbmpeg/Makefile libdvb-0.5.5.1.az/libdvbmpeg/Makefile |
| --- libdvb-0.5.5.1/libdvbmpeg/Makefile 2005-03-22 15:23:25.000000000 +0200 |
| +++ libdvb-0.5.5.1.az/libdvbmpeg/Makefile 1970-01-01 02:00:00.000000000 +0200 |
| @@ -1,36 +0,0 @@ |
| - |
| -include ../config.mk |
| - |
| -DCFLAGS = $(CFLAGS) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE |
| -MFLAG = -M |
| -OBJS = ctools.o ringbuffy.o transform.o cpptools.o |
| -SRC = $(wildcard *.c) |
| -CPPSRC = $(wildcard *.cpp) |
| -CSRC = $(wildcard *.cc) |
| -INCS = -I../include |
| - |
| -all: libdvbmpegtools.a |
| - |
| -.PHONY: depend clean install uninstall |
| - |
| -clean: |
| - - rm -f *.o *~ *.a .depend |
| - |
| -libdvbmpegtools.a: $(OBJS) |
| - ar -rcs libdvbmpegtools.a $(OBJS) |
| - |
| -%.o: %.cc |
| - $(CXX) -c $(DCFLAGS) $(INCLUDES) $(DEFINES) $< |
| - |
| -%.o: %.cpp |
| - $(CXX) -c $(DCFLAGS) $(INCLUDES) $(DEFINES) $< |
| - |
| -%.o: %.c |
| - $(CC) -c $(DCFLAGS) $(INCLUDES) $(DEFINES) $< |
| - |
| -.depend: |
| - $(CXX) $(DEFINES) $(MFLAG) $(SRC) $(CSRC) $(CPPSRC) $(INCLUDES)> .depend |
| - |
| - |
| - |
| -include .depend |
| diff -urpN libdvb-0.5.5.1/libdvbmpeg/Makefile.am libdvb-0.5.5.1.az/libdvbmpeg/Makefile.am |
| --- libdvb-0.5.5.1/libdvbmpeg/Makefile.am 1970-01-01 02:00:00.000000000 +0200 |
| +++ libdvb-0.5.5.1.az/libdvbmpeg/Makefile.am 2006-07-24 20:21:30.000000000 +0200 |
| @@ -0,0 +1,21 @@ |
| +AUTOMAKE_OPTIONS = foreign |
| + |
| +INCLUDES = -I$(top_srcdir)/include |
| + |
| +lib_LTLIBRARIES = libdvbmpegtools.la |
| + |
| +LF_FLAGS = \ |
| + -D_FILE_OFFSET_BITS=64 \ |
| + -D_LARGEFILE_SOURCE \ |
| + -D_LARGEFILE64_SOURCE |
| + |
| +libdvbmpegtools_la_CFLAGS = $(LF_FLAGS) |
| +libdvbmpegtools_la_CXXFLAGS = $(LF_FLAGS) |
| +libdvbmpegtools_la_LDFLAGS = -lpthread |
| +libdvbmpegtools_la_SOURCES = \ |
| + cpptools.cc \ |
| + ctools.c \ |
| + remux.c \ |
| + ringbuffy.c \ |
| + transform.c |
| + |
| diff -urpN libdvb-0.5.5.1/Makefile libdvb-0.5.5.1.az/Makefile |
| --- libdvb-0.5.5.1/Makefile 2005-03-22 15:23:25.000000000 +0200 |
| +++ libdvb-0.5.5.1.az/Makefile 1970-01-01 02:00:00.000000000 +0200 |
| @@ -1,82 +0,0 @@ |
| - |
| -SOURCEDIRS=include libdvb libdvbci libdvbmpeg sample_progs dvb-mpegtools samplerc |
| -DVB-MPEGTOOLS= dvb-mpegtools_main dvb-mplex audiofilter dvbaudio |
| -DVB_LIBS=libdvb.a libdvbci.a libdvbmpegtools.a |
| -HEADERS=include/DVB.hh include/ci.hh include/devices.hh include/channel.h include/ctools.h \ |
| - include/transform.h include/ringbuffy.h include/cpptools.hh include/OSD.h \ |
| - include/osd.hh |
| - |
| -RESOURCES=README |
| -include config.mk |
| - |
| - |
| - |
| -main: $(DVB_LIBS) $(TEST_PROGS) $(DVB-MPEGTOOLS) |
| - |
| -install: $(DVB_LIBS) $(HEADERS) |
| - mkdir -p $(DESTDIR)$(PREFIX)/lib |
| - install -m 644 $(DVB_LIBS) $(DESTDIR)$(PREFIX)/lib/ |
| - mkdir -p $(DESTDIR)$(PREFIX)/include |
| - install -m 644 $(HEADERS) $(DESTDIR)$(PREFIX)/include/ |
| - make -C dvb-mpegtools install |
| - |
| -uninstall: |
| - for i in $(DVB_LIBS); do rm -f $(DESTDIR)$(PREFIX)/lib/$$i;done |
| - for i in $(HEADERS); do rm -f $(DESTDIR)$(PREFIX)/$$i;done |
| - make -C dvb-mpegtools uninstall |
| - |
| -libdvb.a: libdvb/libdvb.a |
| - cp libdvb/libdvb.a . |
| - |
| -libdvbci.a: libdvbci/libdvbci.a |
| - cp libdvbci/libdvbci.a . |
| - |
| -libdvbmpegtools.a: libdvbmpeg/libdvbmpegtools.a |
| - cp libdvbmpeg/libdvbmpegtools.a . |
| - |
| -libdvb/libdvb.a: |
| - make -C libdvb main |
| - |
| -libdvbci/libdvbci.a: |
| - make -C libdvbci main |
| - |
| -libdvbmpeg/libdvbmpegtools.a: |
| - make -C libdvbmpeg libdvbmpegtools.a |
| - |
| -merge_dvb: libdvb.a sample_progs/merge.cc |
| -conv: libdvb.a sample_progs/conv.cc |
| -satscan: libdvb.a sample_progs/satscan.cc |
| -quickscan: libdvb.a sample_progs/quickscan.cc |
| -cam_set: libdvbci.a sample_progs/cam_set.cc |
| -cam_test: libdvb.a libdvbmpegtools.a sample_progs/cam_test.cc |
| - make -C sample_progs main |
| - for f in $(TEST_PROGS); do cp sample_progs/$$f . ; done |
| - |
| -dvb-mpegtools_main: libdvbmpegtools.a dvb-mpegtools/main.cc |
| -dvb-mplex: libdvbmpegtools.a dvb-mpegtools/mplex.cpp |
| -audiofilter: dvb-mpegtools/audiofilter.c |
| -dvbaudio: libdvb.a libdvbmpegtools.a dvb-mpegtools/dvbaudio.cc |
| - make -C dvb-mpegtools all |
| - for f in $(DVB-MPEGTOOLS); do cp dvb-mpegtools/$$f . ; done |
| - |
| -dvbs: libdvb.a libdvbmpegtools.a dvbserver/dvbs_main.cc |
| - make -C dvbserver dvbs_main |
| - |
| - |
| -clean: |
| - -rm -f libdvb-$(VERSION).tar.gz $(DVB_LIBS) $(TEST_PROGS) $(DVB-MPEGTOOLS) *~ |
| - make -C libdvb clean |
| - make -C libdvbci clean |
| - make -C libdvbmpeg clean |
| - make -C sample_progs clean |
| - make -C dvb-mpegtools clean |
| - rm include/*~ |
| - |
| -dist: |
| - mkdir libdvb-$(VERSION) |
| - for f in $(SOURCEDIRS); do mkdir libdvb-$(VERSION)/$$f;done |
| - cp -r $(SOURCEDIRS) libdvb-$(VERSION) |
| - for f in $(SOURCEDIRS); do rm -rf libdvb-$(VERSION)/$$f/CVS;done |
| - cp COPYING README Makefile config.mk libdvb-$(VERSION) |
| - tar zcf libdvb-$(VERSION).tar.gz libdvb-$(VERSION) |
| - rm -rf libdvb-$(VERSION) |
| diff -urpN libdvb-0.5.5.1/Makefile.am libdvb-0.5.5.1.az/Makefile.am |
| --- libdvb-0.5.5.1/Makefile.am 1970-01-01 02:00:00.000000000 +0200 |
| +++ libdvb-0.5.5.1.az/Makefile.am 2006-07-24 21:07:35.000000000 +0200 |
| @@ -0,0 +1,9 @@ |
| +SUBDIRS = \ |
| + include \ |
| + libdvb \ |
| + libdvbci \ |
| + libdvbmpeg \ |
| + dvb-mpegtools \ |
| + sample_progs \ |
| + samplerc |
| + |
| diff -urpN libdvb-0.5.5.1/sample_progs/cam_menu.cc libdvb-0.5.5.1.az/sample_progs/cam_menu.cc |
| --- libdvb-0.5.5.1/sample_progs/cam_menu.cc 2005-03-22 15:23:25.000000000 +0200 |
| +++ libdvb-0.5.5.1.az/sample_progs/cam_menu.cc 2006-07-24 21:14:18.000000000 +0200 |
| @@ -46,7 +46,7 @@ void reset_keypress() |
| |
| void byebye(int i, void *f) |
| { |
| - int fd = (int) f; |
| + long fd = (long) f; |
| |
| CamPacket cp(fd, CMENU_CLOSE, 0, NULL); |
| cp.psend(); |
| diff -urpN libdvb-0.5.5.1/sample_progs/Makefile libdvb-0.5.5.1.az/sample_progs/Makefile |
| --- libdvb-0.5.5.1/sample_progs/Makefile 2005-03-22 15:23:25.000000000 +0200 |
| +++ libdvb-0.5.5.1.az/sample_progs/Makefile 1970-01-01 02:00:00.000000000 +0200 |
| @@ -1,48 +0,0 @@ |
| - |
| -include ../config.mk |
| - |
| -LIBS=-L../ |
| -DVB_LIBS=libdvb.a libdvbci.a |
| -HEADERS=DVB.hh ci.hh devices.hh channel.h |
| -SOURCES=Makefile $(HEADERS) DVB.cc ci.cc devices.cc OSD.h OSD.c osd.hh\ |
| - merge.cc conv.cc satscan.cc cam_set.cc cam_test.cc quickscan.cc cam_menu.cc |
| -RESOURCES=README astrarc hotbirdrc |
| - |
| -main: $(TEST_PROGS) |
| - |
| -dump_TS: dump_TS.cc ../libdvb/libdvb.a ../include/DVB.hh |
| - $(CXX) $(LIBS) $(INCLUDES) $(CFLAGS) -o dump_TS dump_TS.cc -ldvb -ldvbmpegtools |
| - |
| -merge_dvb: merge.cc ../libdvb/libdvb.a ../include/DVB.hh |
| - $(CXX) $(LIBS) $(INCLUDES) $(CFLAGS) -o merge_dvb merge.cc -ldvb |
| - |
| -conv: conv.cc ../libdvb/libdvb.a ../include/DVB.hh |
| - $(CXX) $(LIBS) $(INCLUDES) $(CFLAGS) -o conv conv.cc -ldvb |
| - |
| -satscan: satscan.cc ../libdvb/libdvb.a ../include/DVB.hh |
| - $(CXX) $(LIBS) $(INCLUDES) $(CFLAGS) -o satscan satscan.cc -ldvb |
| - |
| -quickscan: quickscan.cc ../libdvb/libdvb.a ../include/DVB.hh |
| - $(CXX) $(LIBS) $(INCLUDES) $(CFLAGS) -o quickscan quickscan.cc -ldvb |
| - |
| -cam_set: cam_set.cc cam_menu.hh ../libdvbci/libdvbci.a ../include/ci.hh |
| - $(CXX) $(LIBS) $(INCLUDES) $(CFLAGS) -o cam_set cam_set.cc -ldvbci |
| - |
| -cam_test: cam_test.cc ../libdvb/libdvb.a ../include/DVB.hh ../include/ci.hh |
| - $(CXX) $(LIBS) $(INCLUDES) -o cam_test cam_test.cc -ldvb -ldvbmpegtools |
| - |
| -cam_menu: cam_menu.cc cam_menu.hh ../libdvb/libdvb.a ../include/DVB.hh |
| - $(CXX) $(LIBS) $(INCLUDES) -o cam_menu cam_menu.cc -ldvb |
| - |
| -status_check: status_check.c |
| - $(CC) $(INCLUDES) $(CFLAGS) -o status_check status_check.c |
| - |
| -.c.o: |
| - $(CC) $(INCLUDES) $(CFLAGS) -c $< |
| - |
| -.cc.o: |
| - $(CXX) $(INCLUDES) $(CFLAGS) -c $< |
| - |
| -clean: |
| - -rm -f *.o $(TEST_PROGS) *~ |
| - |
| diff -urpN libdvb-0.5.5.1/sample_progs/Makefile.am libdvb-0.5.5.1.az/sample_progs/Makefile.am |
| --- libdvb-0.5.5.1/sample_progs/Makefile.am 1970-01-01 02:00:00.000000000 +0200 |
| +++ libdvb-0.5.5.1.az/sample_progs/Makefile.am 2006-07-24 21:23:45.000000000 +0200 |
| @@ -0,0 +1,45 @@ |
| +INCLUDES = -I$(top_srcdir)/include |
| + |
| +noinst_PROGRAMS = \ |
| + merge_dvb \ |
| + conv \ |
| + satscan \ |
| + cam_set \ |
| + cam_test \ |
| + quickscan \ |
| + cam_menu \ |
| + dump_TS |
| +# Not building currently |
| +# status_check |
| + |
| +LIBDVB = $(top_builddir)/libdvb/libdvb.la |
| +LIBDVBCI = $(top_builddir)/libdvbci/libdvbci.la |
| +LIBDVBMPEG = $(top_builddir)/libdvbmpeg/libdvbmpegtools.la |
| + |
| +dump_TS_LDADD = $(LIBDVB) $(LIBDVBMPEG) |
| +dump_TS_SOURCES = dump_TS.cc |
| + |
| +merge_dvb_LDADD = $(LIBDVB) |
| +merge_dvb_SOURCES = merge.cc |
| + |
| +conv_LDADD = $(LIBDVB) |
| +conv_SOURCES = conv.cc |
| + |
| +satscan_LDADD = $(LIBDVB) |
| +satscan_SOURCES = satscan.cc |
| + |
| +quickscan_LDADD = $(LIBDVB) |
| +quickscan_SOURCES = quickscan.cc |
| + |
| +cam_set_LDADD = $(LIBDVBCI) |
| +cam_set_SOURCES = cam_set.cc cam_menu.hh |
| + |
| +cam_test_LDADD = $(LIBDVB) $(LIBDVBMPEG) |
| +cam_test_SOURCES = cam_test.cc |
| + |
| +cam_menu_LDADD = $(LIBDVB) |
| +cam_menu_SOURCES = cam_menu.cc cam_menu.hh |
| + |
| +# Not building currently |
| +#status_check_SOURCES = status_check.c |
| + |
| diff -urpN libdvb-0.5.5.1/samplerc/Makefile.am libdvb-0.5.5.1.az/samplerc/Makefile.am |
| --- libdvb-0.5.5.1/samplerc/Makefile.am 1970-01-01 02:00:00.000000000 +0200 |
| +++ libdvb-0.5.5.1.az/samplerc/Makefile.am 2006-07-24 21:06:49.000000000 +0200 |
| @@ -0,0 +1,11 @@ |
| +EXTRA_DIST = \ |
| + 28erc \ |
| + astrarc \ |
| + astra.xml \ |
| + dvbt-koeln \ |
| + hotbirdrc \ |
| + nokia.dat \ |
| + siriusrc \ |
| + thorrc \ |
| + w2-16.nokia |
| + |
