diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-19 21:07:37 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-19 21:07:37 +0200 |
| commit | 7f68c00d0201efb725ae5e959d63105168ce82ea (patch) | |
| tree | ece44562d695f79e2dc590623705838300926190 /package/xawtv/patches | |
| parent | 65cd7b7d328e4ca6e0b2e074b442aa5933cd90d8 (diff) | |
| parent | f2984000823abd21a4c5a157a08ec28a3ddf0a4a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/xawtv/patches')
| -rw-r--r-- | package/xawtv/patches/patch-Makefile | 17 | ||||
| -rw-r--r-- | package/xawtv/patches/patch-Makefile.orig | 10 | ||||
| -rw-r--r-- | package/xawtv/patches/patch-Makefile_in | 11 | ||||
| -rw-r--r-- | package/xawtv/patches/patch-mk_Compile_mk | 11 |
4 files changed, 49 insertions, 0 deletions
diff --git a/package/xawtv/patches/patch-Makefile b/package/xawtv/patches/patch-Makefile new file mode 100644 index 000000000..814892d9e --- /dev/null +++ b/package/xawtv/patches/patch-Makefile @@ -0,0 +1,17 @@ +--- xawtv-3.102.orig/Makefile 2011-09-05 19:26:02.000000000 +0200 ++++ xawtv-3.102/Makefile 2011-09-18 21:53:53.767990433 +0200 +@@ -1,6 +1,6 @@ + + # passed to configure +-prefix = /usr/local ++prefix = /usr + + # arch name -- for build directory + arch := $(shell echo "arch-`uname -m`-`uname -s`" | tr "A-Z" "a-z") +@@ -21,5 +21,5 @@ tag archive rpm dsc debs pbuild release + + $(arch)/Makefile: configure + mkdir -p $(arch) +- (cd $(arch); ../configure \ ++ (cd $(arch); ../configure --disable-xft \ + --prefix=$(prefix) ) diff --git a/package/xawtv/patches/patch-Makefile.orig b/package/xawtv/patches/patch-Makefile.orig new file mode 100644 index 000000000..ad7a5446d --- /dev/null +++ b/package/xawtv/patches/patch-Makefile.orig @@ -0,0 +1,10 @@ +--- xawtv-3.102.orig/Makefile 2011-09-05 19:26:02.000000000 +0200 ++++ xawtv-3.102/Makefile 2011-09-18 20:40:23.159241503 +0200 +@@ -1,6 +1,6 @@ + + # passed to configure +-prefix = /usr/local ++prefix = /usr + + # arch name -- for build directory + arch := $(shell echo "arch-`uname -m`-`uname -s`" | tr "A-Z" "a-z") diff --git a/package/xawtv/patches/patch-Makefile_in b/package/xawtv/patches/patch-Makefile_in new file mode 100644 index 000000000..cac9d71bc --- /dev/null +++ b/package/xawtv/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- xawtv-3.102.orig/Makefile.in 2011-09-05 19:26:02.000000000 +0200 ++++ xawtv-3.102/Makefile.in 2011-09-18 20:42:35.107990034 +0200 +@@ -3,7 +3,7 @@ VPATH := $(srcdir) + + # for package builds (buildroot install + no root privs needed) + DESTDIR= +-SUID_ROOT=-m4755 -o root ++SUID_ROOT=-m755 + STRIP_FLAG= + + # install paths diff --git a/package/xawtv/patches/patch-mk_Compile_mk b/package/xawtv/patches/patch-mk_Compile_mk new file mode 100644 index 000000000..0c64d48fc --- /dev/null +++ b/package/xawtv/patches/patch-mk_Compile_mk @@ -0,0 +1,11 @@ +--- xawtv-3.102.orig/mk/Compile.mk 2011-09-05 19:26:02.000000000 +0200 ++++ xawtv-3.102/mk/Compile.mk 2011-09-18 20:39:27.867990854 +0200 +@@ -13,7 +13,7 @@ + ######################################################################## + + # verbose yes/no +-verbose ?= no ++verbose ?= yes + + # dependency files + tmpdep = mk/$(subst /,_,$*).tmp |