aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim 'timtim' Ellis <tim.ellis@foonas.org>2009-05-16 21:01:09 +0100
committerTim 'timtim' Ellis <tim.ellis@foonas.org>2009-05-16 21:01:09 +0100
commit0d55f9e5437752940602caff7aace9c7994409e1 (patch)
tree0277be5a87110cd8c35c0873773e91b485045995
parentce7d21308430468c4d0ef3b6e2642112be52bae9 (diff)
downloadopenembedded-0d55f9e5437752940602caff7aace9c7994409e1.tar.gz
mpeg-encode: Make this aware of LDFLAGS, fixes QA GNU_HASH issue
-rw-r--r--recipes/mpeg-encode/files/fixup.patch14
-rw-r--r--recipes/mpeg-encode/mpeg-encode_1.5b.bb2
2 files changed, 9 insertions, 7 deletions
diff --git a/recipes/mpeg-encode/files/fixup.patch b/recipes/mpeg-encode/files/fixup.patch
index eda092058e..a40c1bf120 100644
--- a/recipes/mpeg-encode/files/fixup.patch
+++ b/recipes/mpeg-encode/files/fixup.patch
@@ -1,6 +1,6 @@
diff -urN mpeg_encode.old/headers/libpnmrw.h mpeg_encode/headers/libpnmrw.h
--- mpeg_encode.old/headers/libpnmrw.h 1995-08-09 16:17:41.000000000 +0100
-+++ mpeg_encode/headers/libpnmrw.h 2009-03-24 23:24:25.000000000 +0000
++++ mpeg_encode/headers/libpnmrw.h 2009-05-16 17:38:24.000000000 +0100
@@ -13,18 +13,7 @@
#ifndef _PNMRW_H_
#define _PNMRW_H_
@@ -22,7 +22,7 @@ diff -urN mpeg_encode.old/headers/libpnmrw.h mpeg_encode/headers/libpnmrw.h
diff -urN mpeg_encode.old/jpeg/Makefile mpeg_encode/jpeg/Makefile
--- mpeg_encode.old/jpeg/Makefile 1995-08-05 00:27:00.000000000 +0100
-+++ mpeg_encode/jpeg/Makefile 2009-03-24 23:24:25.000000000 +0000
++++ mpeg_encode/jpeg/Makefile 2009-05-16 17:38:24.000000000 +0100
@@ -20,9 +20,6 @@
manprefix =
manext = 1
@@ -56,7 +56,7 @@ diff -urN mpeg_encode.old/jpeg/Makefile mpeg_encode/jpeg/Makefile
cjpeg: $(COBJECTS) libjpeg.a
diff -urN mpeg_encode.old/libpnmrw.c mpeg_encode/libpnmrw.c
--- mpeg_encode.old/libpnmrw.c 1995-08-16 23:24:26.000000000 +0100
-+++ mpeg_encode/libpnmrw.c 2009-03-24 23:24:25.000000000 +0000
++++ mpeg_encode/libpnmrw.c 2009-05-16 17:38:24.000000000 +0100
@@ -28,6 +28,7 @@
#endif
@@ -76,12 +76,14 @@ diff -urN mpeg_encode.old/libpnmrw.c mpeg_encode/libpnmrw.c
e = sys_errlist[errno];
diff -urN mpeg_encode.old/Makefile mpeg_encode/Makefile
--- mpeg_encode.old/Makefile 1995-08-16 23:16:56.000000000 +0100
-+++ mpeg_encode/Makefile 2009-03-24 23:24:47.000000000 +0000
-@@ -204,7 +204,7 @@
++++ mpeg_encode/Makefile 2009-05-16 18:56:22.000000000 +0100
+@@ -203,8 +203,8 @@
+ ############
mpeg_encode: $(MP_ALL_OBJS) $(JPEG_LIB)
- $(PURIFY) $(CC) $(CFLAGS) -o $@ $(MP_ALL_OBJS) $(LIBDIRS) $(LIBS)
+- $(PURIFY) $(CC) $(CFLAGS) -o $@ $(MP_ALL_OBJS) $(LIBDIRS) $(LIBS)
- strip mpeg_encode
++ $(PURIFY) $(CC) $(CFLAGS) -o $@ $(MP_ALL_OBJS) $(LIBDIRS) $(LIBS) $(LDFLAGS)
+ $(STRIP) mpeg_encode
profile: $(MP_ALL_OBJS)
diff --git a/recipes/mpeg-encode/mpeg-encode_1.5b.bb b/recipes/mpeg-encode/mpeg-encode_1.5b.bb
index d32322a504..0f851b1f36 100644
--- a/recipes/mpeg-encode/mpeg-encode_1.5b.bb
+++ b/recipes/mpeg-encode/mpeg-encode_1.5b.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "The Berkeley MPEG Encoder."
HOMEPAGE = "http://bmrc.berkeley.edu/frame/research/mpeg/mpeg_encode.html"
SECTION = "multimedia"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://bmrc.berkeley.edu/ftp/pub/multimedia/mpeg/encode/mpeg_encode-${PV}-src.tar.gz \
file://fixup.patch;patch=1"