diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-03-25 18:29:54 +0100 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-03-25 18:29:54 +0100 |
| commit | 95e0882e2dfabe457550a885e0eb24893df31742 (patch) | |
| tree | a34220ed25168022c53d9cb5697f3666a427b30c /recipes/mpeg-encode/files | |
| parent | 451b1c687105655a4f2c9c477b05535041e25060 (diff) | |
| parent | ac41ae95b1dbe54c05adf494c0fa44b3abbfeca3 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/mpeg-encode/files')
| -rw-r--r-- | recipes/mpeg-encode/files/fixup.patch | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/recipes/mpeg-encode/files/fixup.patch b/recipes/mpeg-encode/files/fixup.patch index c90f32760a..eda092058e 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) |