[SM-Commit] GIT changes to master grimoire by Florian Franzmann (0ad6ff89bcc20ee9861488b0af019fefcd43ce11)

Florian Franzmann scm at mail.sourcemage.org
Tue Mar 13 05:42:48 EDT 2007


GIT changes to master grimoire by Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>:

 video-libs/libdvb/BUILD          |    2 --
 video-libs/libdvb/DETAILS        |    4 ++--
 video-libs/libdvb/HISTORY        |    5 +++++
 video-libs/libdvb/PRE_BUILD      |    4 ++++
 video-libs/libdvb/config.patch   |   14 --------------
 video-libs/libdvb/makefile.patch |   20 --------------------
 6 files changed, 11 insertions(+), 38 deletions(-)

New commits:
commit 1c7cb6e0e9d4aa9d7fa3ea2d18677489bc6891cf
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    video-libs/libdvb: updated to 0.5.5.1

diff --git a/video-libs/libdvb/BUILD b/video-libs/libdvb/BUILD
index f5dc54b..f4e3d7a 100755
--- a/video-libs/libdvb/BUILD
+++ b/video-libs/libdvb/BUILD
@@ -1,7 +1,5 @@
 export  CFLAGS="${CFLAGS} -Wall -g"             &&
 export  CXXFLAGS=${CFLAGS}                      &&
-patch -p0 < ${SCRIPT_DIRECTORY}/config.patch    &&
-patch -p0 < ${SCRIPT_DIRECTORY}/makefile.patch  &&
 make_single                                     &&
 make                                            &&
 make_normal
diff --git a/video-libs/libdvb/DETAILS b/video-libs/libdvb/DETAILS
index 93fdd10..4d6040a 100755
--- a/video-libs/libdvb/DETAILS
+++ b/video-libs/libdvb/DETAILS
@@ -1,9 +1,9 @@
            SPELL=libdvb
-         VERSION=0.5.4
+         VERSION=0.5.5.1
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://www.metzlerbros.org/dvb/$SOURCE
-     SOURCE_HASH=sha512:23fcf588ba974e7b811e4accaa2d86d82bc278327f75f38d1ca01de25d63e07258df06e3b038cc2400f2e813e227c95d322fb3927db76aadbec245ae0e9dd5a8
+     SOURCE_HASH=sha512:6e776e9a01b0059e46124f8525c1b83951295bc695100386e3a488dfbe058ef074a96019bb77c5fd2c51b9baf67beb889af00914cfd796e2dd175f9423c449d4
       LICENSE[0]=LGPL
         WEB_SITE=http://www.metzlerbros.org/dvb/index.html
          ENTERED=20040424
diff --git a/video-libs/libdvb/HISTORY b/video-libs/libdvb/HISTORY
index 56e93f9..1c3cb08 100644
--- a/video-libs/libdvb/HISTORY
+++ b/video-libs/libdvb/HISTORY
@@ -1,3 +1,8 @@
+2007-03-13 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: updated to 0.5.5.1
+	* config.patch, makefile.patch: removed
+	* BUILD, PRE_BUILD: moved patching/sediting to PRE_BUILD
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/video-libs/libdvb/PRE_BUILD b/video-libs/libdvb/PRE_BUILD
new file mode 100755
index 0000000..b870bc6
--- /dev/null
+++ b/video-libs/libdvb/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build                                                                        &&
+cd ${SOURCE_DIRECTORY}                                                                   &&
+sedit "s:^PREFIX = /usr/local:PREFIX = $INSTALL_ROOT/usr:" ${SOURCE_DIRECTORY}/config.mk &&
+sedit "s:CFLAGS=.*:CFLAGS=$CFLAGS:" ${SOURCE_DIRECTORY}/config.mk
diff --git a/video-libs/libdvb/config.patch b/video-libs/libdvb/config.patch
deleted file mode 100644
index af36d4d..0000000
--- a/video-libs/libdvb/config.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- config.mk.orig	2004-04-25 02:02:56.237510880 -0500
-+++ config.mk	2004-04-25 02:03:07.030870040 -0500
-@@ -1,9 +1,9 @@
- # -*- makefile -*-
- #
- 
--PREFIX = /usr/local
-+PREFIX = /usr
- VERSION = 0.5.4
--CFLAGS=-O2 -Wall -g
-+#CFLAGS=-O2 -Wall -g
- INCLUDES=-I. -I../include -I../../include
- TEST_PROGS= merge_dvb conv satscan cam_set cam_test quickscan cam_menu dump_TS
- #CXX = g++-3.2
diff --git a/video-libs/libdvb/makefile.patch b/video-libs/libdvb/makefile.patch
deleted file mode 100644
index 8bef0d4..0000000
--- a/video-libs/libdvb/makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- dvb-mpegtools/Makefile.orig	2004-04-25 01:30:29.595445456 -0500
-+++ dvb-mpegtools/Makefile	2004-04-25 01:34:10.012936904 -0500
-@@ -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:
-@@ -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 ;\



More information about the SM-Commit mailing list