aboutsummaryrefslogtreecommitdiffstats
path: root/packages/faad2
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-01-07 16:40:07 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-01-07 16:40:07 +0000
commit0b3f69daef9f8b3c7ad888a4d75c1782463b3331 (patch)
tree15f2f9d244019b1151aecd76e8fa923e57c5b94b /packages/faad2
parent796d95e4dd0afa1dccef44c003df614ea0630b86 (diff)
downloadopenembedded-0b3f69daef9f8b3c7ad888a4d75c1782463b3331.tar.gz
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/01/07 17:35:51+01:00 (none)!koen Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into lieve.(none):/data/build/oe/clean-tree/openembedded 2005/01/07 17:34:59+01:00 (none)!koen make faad2 buildable again by refreshing patches 2005/01/07 17:09:12+01:00 local!hrw openzaurus 2.6.10: kernel is copied to deploy/images after build BKrev: 41debb6746cDf-wGGQKF8b376XdXVw
Diffstat (limited to 'packages/faad2')
-rw-r--r--packages/faad2/faad2-2.0/Makefile.patch8
-rw-r--r--packages/faad2/faad2_2.0.bb2
2 files changed, 5 insertions, 5 deletions
diff --git a/packages/faad2/faad2-2.0/Makefile.patch b/packages/faad2/faad2-2.0/Makefile.patch
index 32c834a353..2c68529baf 100644
--- a/packages/faad2/faad2-2.0/Makefile.patch
+++ b/packages/faad2/faad2-2.0/Makefile.patch
@@ -1,8 +1,8 @@
---- faad2/Makefile.am.orig 2004-12-24 22:59:30.000000000 +0100
-+++ faad2/Makefile.am 2004-12-24 22:59:42.000000000 +0100
-@@ -1,8 +1,3 @@
+--- Makefile.am 2005-01-07 17:19:25.353714920 +0100
++++ Makefile.am.orig 2005-01-07 17:23:30.679419744 +0100
+@@ -1,8 +1,2 @@
SUBDIRS = libfaad common frontend plugins
-
+-
EXTRA_DIST = faad2.spec
-
-rpm: Makefile
diff --git a/packages/faad2/faad2_2.0.bb b/packages/faad2/faad2_2.0.bb
index 5ccff29ce4..883cabc3b5 100644
--- a/packages/faad2/faad2_2.0.bb
+++ b/packages/faad2/faad2_2.0.bb
@@ -8,7 +8,7 @@ DEPENDS = ""
inherit autotools
SRC_URI = "${SOURCEFORGE_MIRROR}/faac/${PN}-${PV}.zip \
- file://Makefile.patch;patch=1 \
+ file://Makefile.patch;pnum=0;patch=1 \
"
S="${WORKDIR}/${PN}"