[SCM] dvblast/master: Refresh 01_remove_bad_cflags.diff patch.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Wed Dec 28 09:18:48 UTC 2011


The following commit has been merged in the master branch:
commit 483c24c46f158703d6c32d5f51d9e785ed66444e
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Dec 25 12:08:09 2011 +0100

    Refresh 01_remove_bad_cflags.diff patch.

diff --git a/debian/patches/01_remove_bad_cflags.diff b/debian/patches/01_remove_bad_cflags.diff
index 115d351..9ec8e5a 100644
--- a/debian/patches/01_remove_bad_cflags.diff
+++ b/debian/patches/01_remove_bad_cflags.diff
@@ -1,14 +1,16 @@
 Remove some unneeded CFLAGS.
 
---- dvblast-1.1.orig/Makefile	2009-05-11 15:05:39.000000000 +0200
-+++ dvblast-1.1/Makefile	2010-01-18 14:44:26.459058679 +0100
-@@ -1,9 +1,6 @@
- # DVBlast Makefile
--# Customise the path of your kernel
+---
+ Makefile |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- dvblast.orig/Makefile
++++ dvblast/Makefile
+@@ -6,7 +6,6 @@ TOPDIR = `basename ${PWD}`
+ GIT_VER = $(shell git describe --tags --dirty --always 2>/dev/null)
  
- CFLAGS += -Wall -O3 -fomit-frame-pointer
+ CFLAGS += -Wall -Wformat-security -O3 -fomit-frame-pointer
 -CFLAGS += -g
--CFLAGS += -I/usr/src/kernel/linux-2.6.29.1/include
- LDLIBS += -lrt
- LDLIBS_DVBLAST += -ldvbpsi -lpthread
-
+ ifneq "$(GIT_VER)" ""
+ CFLAGS += -DVERSION_EXTRA=\"git-$(GIT_VER)\"
+ else

-- 
dvblast packaging



More information about the pkg-multimedia-commits mailing list