[oe-commits] Tim 'timtim' Ellis : mpeg-encode: Fixup makefile to use the right strip

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 3751f09c2b00e7bf9564efe6a9dc30fd14febea8
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=3751f09c2b00e7bf9564efe6a9dc30fd14febea8

Author: Tim 'timtim' Ellis <tim.ellis at foonas.org>
Date:   Tue Mar 24 23:29:21 2009 +0000

mpeg-encode: Fixup makefile to use the right strip

---

 recipes/mpeg-encode/files/fixup.patch   |   30 +++++++++++++++++++++---------
 recipes/mpeg-encode/mpeg-encode_1.5b.bb |    2 +-
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/recipes/mpeg-encode/files/fixup.patch b/recipes/mpeg-encode/files/fixup.patch
index c90f327..eda0920 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-02-10 17:06:09.508519503 +0000
+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
 @@ -13,18 +13,7 @@
  #ifndef _PNMRW_H_
  #define _PNMRW_H_
@@ -20,9 +20,9 @@ diff -urN mpeg_encode.old//headers/libpnmrw.h mpeg_encode//headers/libpnmrw.h
  
  /* Definitions to make PBMPLUS work with either ANSI C or C Classic. */
  
-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-02-10 17:27:20.488862124 +0000
+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
 @@ -20,9 +20,6 @@
  manprefix =
  manext = 1
@@ -54,9 +54,9 @@ diff -urN mpeg_encode.old//jpeg/Makefile mpeg_encode//jpeg/Makefile
  	$(AR2) libjpeg.a
  
  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-02-10 17:58:49.768855068 +0000
+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
 @@ -28,6 +28,7 @@
  #endif
  
@@ -74,3 +74,15 @@ diff -urN mpeg_encode.old//libpnmrw.c mpeg_encode//libpnmrw.c
    char* e;
  
    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: $(MP_ALL_OBJS) $(JPEG_LIB)
+ 	$(PURIFY) $(CC) $(CFLAGS) -o $@ $(MP_ALL_OBJS) $(LIBDIRS) $(LIBS)
+-	strip mpeg_encode
++	$(STRIP) mpeg_encode
+ 
+ profile: $(MP_ALL_OBJS)
+ 	$(PURIFY) $(CC) -Bstatic -pg $(CFLAGS) -o $@ $(MP_ALL_OBJS) $(LIBDIRS) $(LIBS)
diff --git a/recipes/mpeg-encode/mpeg-encode_1.5b.bb b/recipes/mpeg-encode/mpeg-encode_1.5b.bb
index c350739..d32322a 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 = "r0"
+PR = "r1"
 
 SRC_URI = "http://bmrc.berkeley.edu/ftp/pub/multimedia/mpeg/encode/mpeg_encode-${PV}-src.tar.gz \
            file://fixup.patch;patch=1"