Mailing List archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[linux-dvb] libdvb 0.5.4 patches
I had sent the patches to metzlerbros (rjkm) but so far no reply. So I
think it is best to put them on linux-dvb message archive for other people
who go to make rpm packages of libdvb - these patches might help you. ;-)
cheers,
-- guido http://google.de/search?q=guidod
GCS/E/S/P C++/++++$ ULHS L++w- N++@ s+:a d(+-) r+@>+++ y++ 5++X- (geekcode)
--- Makefile.orig 2004-01-28 20:44:28.000000000 +0100
+++ Makefile 2004-02-12 20:58:45.000000000 +0100
@@ -14,15 +14,15 @@
main: $(DVB_LIBS) $(TEST_PROGS) $(DVB-MPEGTOOLS)
install: $(DVB_LIBS) $(HEADERS)
- mkdir -p $(PREFIX)/lib
- install -m 644 $(DVB_LIBS) $(PREFIX)/lib/
- mkdir -p $(PREFIX)/include
- install -m 644 $(HEADERS) $(PREFIX)/include/
+ 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 $(PREFIX)/lib/$$i;done
- for i in $(HEADERS); do rm -f $(PREFIX)/$$i;done
+ 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
--- dvb-mpegtools/Makefile.destdir 2004-02-12 18:52:00.000000000 +0100
+++ dvb-mpegtools/Makefile 2004-02-12 21:17:32.000000000 +0100
@@ -25,7 +25,7 @@
links: dvb-mpegtools_main
for f in $(LINKS); do\
- ln -sf dvb-mpegtools $$f ;\
+ ln -sf dvb-mpegtools_main $$f ;\
done
clean:
@@ -57,22 +57,22 @@
$(CC) -c $(DCFLAGS) $(INCLUDES) $(DEFINES) $<
install: dvb-mpegtools_main
- install -D -m 755 dvb-mplex $(PREFIX)/bin/dvb-mplex
- install -m 755 audiofilter $(PREFIX)/bin/
- install -m 755 dvb-mpegtools_main $(PREFIX)/bin/
- install -m 755 dvbaudio $(PREFIX)/bin/
- install -m 755 show_dvb_image $(PREFIX)/bin/
- install -m 755 dia $(PREFIX)/bin/
+ 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\
- ln -sf $(PREFIX)/bin/dvb-mpegtools_main $(PREFIX)/bin/$$f ;\
+ (cd $(DESTDIR)$(PREFIX)/bin && ln -s -f dvb-mpegtools_main $$f) ;\
done
uninstall:
- for f in $(LINKS); do rm -f $(PREFIX)/bin/$$f;done
- rm -f $(PREFIX)/bin/dvb-mpegtools_main
- rm -f $(PREFIX)/bin/dvbaudio
- rm -f $(PREFIX)/bin/audiofilter
- rm -f $(PREFIX)/lib/libdvbmpegtools
+ 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
--- sample_progs/Makefile.destdir 2004-01-28 20:44:27.000000000 +0100
+++ sample_progs/Makefile 2004-02-12 21:01:29.000000000 +0100
@@ -45,3 +45,7 @@
clean:
-rm -f *.o $(TEST_PROGS) *~
+
+install : $(TEST_PROGS)
+ for i in $(TEST_PROGS) ; do \
+ install -m 755 $$i $(DESTDIR)$(PREFIX)/bin/dvb_$$i ; done
--- dvb-mpegtools/main.cc.orig 2004-01-28 20:44:27.000000000 +0100
+++ dvb-mpegtools/main.cc 2004-02-12 21:37:19.000000000 +0100
@@ -266,6 +266,11 @@
if (!strcmp(basename(argv[0]), prognames[progn]))
break;
+ if (progn == PROGS+1 && argc > 1 && !strncmp(argv[0], "dvb_", 4))
+ for (progn = 0; progn < PROGS+1; progn ++)
+ if (!strcmp(basename(argv[0])+4, prognames[progn]))
+ break;
+
if (progn == PROGS+1 && argc > 1)
for (progn = 0; progn < PROGS+1; progn ++)
if (!strcmp(basename(argv[1]), prognames[progn])) {
--- Makefile.orig 2004-01-28 20:44:28.000000000 +0100
+++ Makefile 2004-02-12 20:50:53.000000000 +0100
@@ -78,3 +78,25 @@
cp README Makefile config.mk libdvb-$(VERSION)
tar zcf libdvb-$(VERSION).tar.gz libdvb-$(VERSION)
rm -rf libdvb-$(VERSION)
+
+pkgconfigdir=$(PREFIX)/lib/pkgconfig
+pkg_incdir=$(PREFIX)/include
+pkg_libdir=$(PREFIX)/lib
+$(DVB_LIBS:.a=.pc) : Makefile config.mk
+pkgconfig: $(DVB_LIBS:.a=.pc)
+ for lib in $(DVB_LIBS:.a=) ; do make pkgconfig-build lib=$$lib ; done
+pkgconfig-build :
+ echo "libdir=$(PREFIX)/lib" >$(lib).pc
+ echo "includedir=$(PREFIX)/include" >>$(lib).pc
+ echo "largefile= -D_FILE_OFFSET_BITS=64" >>$(lib).pc
+ echo "" >>$(lib).pc
+ echo "Name: $(lib)" >>$(lib).pc
+ echo "Version: $(VERSION)" >>$(lib).pc
+ echo "Description: DVB mpegtools $(lib)" >>$(lib).pc
+ echo 'Cflags: $${largefile} -I${pkg_incdir}' >>$(lib).pc
+ echo 'Libs: -L$${pkg_libdir} -l$(subst lib,,$(lib))' >>$(lib).pc
+pkgconfig-install: pkgconfig
+ mkdir -p $(DESTDIR)$(pkgconfigdir)
+ for lib in $(DVB_LIBS:.a=) ; do cp $$lib.pc $(DESTDIR)$(pkgconfigdir)/ ; done
+pkgconfig-uninstall:
+ for lib in $(DVB_LIBS:.a=) ; do rm $(DESTDIR)$(pkgconfigdir)/$$lib.pc ; done
--- dvb-mpegtools/Makefile.orig 2004-01-28 20:44:27.000000000 +0100
+++ dvb-mpegtools/Makefile 2004-02-12 18:52:00.000000000 +0100
@@ -61,7 +61,7 @@
install -m 755 audiofilter $(PREFIX)/bin/
install -m 755 dvb-mpegtools_main $(PREFIX)/bin/
install -m 755 dvbaudio $(PREFIX)/bin/
- install -m 755 dvb_show_image $(PREFIX)/bin/
+ install -m 755 show_dvb_image $(PREFIX)/bin/
install -m 755 dia $(PREFIX)/bin/
for f in $(LINKS); do\
ln -sf $(PREFIX)/bin/dvb-mpegtools_main $(PREFIX)/bin/$$f ;\
Home |
Main Index |
Thread Index