[oe-commits] Tim 'timtim' Ellis : mpeg-encode: Add package, optional utility for zoneminder

[GIT User account]

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

Author: Tim 'timtim' Ellis <tim.ellis at foonas.org>
Date:   Sat Feb 14 00:32:40 2009 +0000

mpeg-encode: Add package, optional utility for zoneminder

---

 conf/checksums.ini                       |    4 ++
 packages/mpeg-encode/files/fixup.patch   |   76 ++++++++++++++++++++++++++++++
 packages/mpeg-encode/mpeg-encode_1.5b.bb |   16 ++++++
 3 files changed, 96 insertions(+), 0 deletions(-)

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 7ec185d..443d610 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -15298,6 +15298,10 @@ sha256=30e454514ef84f65162182b7cbcd0e46fdda4c99111ac500b5b2df7678ca10fd
 md5=52d10ea80595ec83d8557ba7ac6dc8e6
 sha256=9416376952812e5b479745d67a2bf874fbcad10137517314ce7de37abb756df8
 
+[http://bmrc.berkeley.edu/ftp/pub/multimedia/mpeg/encode/mpeg_encode-1.5b-src.tar.gz]
+md5=ff125fb82118efc7c852f0d26d5552c6
+sha256=dd8db42f88393bb0ff0d738defa271729a8aa9b8de24ed13bc6bd27014f2daf5
+
 [http://www.mpfr.org/mpfr-2.1.1/mpfr-2.1.1.tar.bz2]
 md5=843422d90349800ee721f6710d051c87
 sha256=df551fb075d5e6d0824b74d231962cf0e104c43f646e233675d952ef3c03debc
diff --git a/packages/mpeg-encode/files/fixup.patch b/packages/mpeg-encode/files/fixup.patch
new file mode 100644
index 0000000..c90f327
--- /dev/null
+++ b/packages/mpeg-encode/files/fixup.patch
@@ -0,0 +1,76 @@
+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
+@@ -13,18 +13,7 @@
+ #ifndef _PNMRW_H_
+ #define _PNMRW_H_
+ 
+-/* CONFIGURE: On some systems, malloc.h doesn't declare these, so we have
+-** to do it.  On other systems, for example HP/UX, it declares them
+-** incompatibly.  And some systems, for example Dynix, don't have a
+-** malloc.h at all.  A sad situation.  If you have compilation problems
+-** that point here, feel free to tweak or remove these declarations.
+-*/
+ #include <malloc.h>
+-#if !defined(sco)  &&  !defined(sgi) && !defined(IRIX)
+-extern char* malloc();
+-#endif
+-/* End of configurable definitions. */
+-
+ 
+ /* 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
+@@ -20,9 +20,6 @@
+ manprefix =
+ manext = 1
+ 
+-# The name of your C compiler:
+-CC= gcc
+-
+ # You may need to adjust these cc options:
+ CFLAGS= -O -I$(srcdir)
+ # Generally, we recommend defining any configuration symbols in jconfig.h,
+@@ -49,10 +46,8 @@
+ RM= rm -f
+ # file rename command
+ MV= mv
+-# library (.a) file creation command
+-AR= ar rc
+ # second step in .a creation (use "touch" if not needed)
+-AR2= ranlib
++AR2= $(RANLIB)
+ # installation program
+ INSTALL= /bin/install -c
+ INSTALL_PROGRAM= $(INSTALL)
+@@ -121,7 +116,7 @@
+ 
+ libjpeg.a:  $(LIBOBJECTS)
+ 	$(RM) libjpeg.a
+-	$(AR) libjpeg.a  $(LIBOBJECTS)
++	$(AR) rc libjpeg.a  $(LIBOBJECTS)
+ 	$(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
+@@ -28,6 +28,7 @@
+ #endif
+ 
+ #include <stdio.h>
++#include <errno.h>
+ #include "libpnmrw.h"
+ 
+ /* if don't have string.h, try strings.h */
+@@ -126,8 +127,6 @@
+   pm_perror( reason )
+ char* reason;
+ {
+-  extern char* sys_errlist[];
+-  extern int errno;
+   char* e;
+ 
+   e = sys_errlist[errno];
diff --git a/packages/mpeg-encode/mpeg-encode_1.5b.bb b/packages/mpeg-encode/mpeg-encode_1.5b.bb
new file mode 100644
index 0000000..c350739
--- /dev/null
+++ b/packages/mpeg-encode/mpeg-encode_1.5b.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "The Berkeley MPEG Encoder."
+HOMEPAGE = "http://bmrc.berkeley.edu/frame/research/mpeg/mpeg_encode.html"
+SECTION = "multimedia"
+PR = "r0"
+
+SRC_URI = "http://bmrc.berkeley.edu/ftp/pub/multimedia/mpeg/encode/mpeg_encode-${PV}-src.tar.gz \
+           file://fixup.patch;patch=1"
+
+S = "${WORKDIR}/mpeg_encode"
+
+CFLAGS_append += " -I${S}/headers"
+
+do_install() {
+        install -D -m 0755 ${S}/mpeg_encode ${D}${bindir}/mpeg_encode
+        install -D -m 0644 ${S}/mpeg_encode.1 ${D}${mandir}/man1/mpeg_encode.1
+}