Date: Monday, December 5, 2011 @ 09:03:03
Author: jgc
Revision: 144395
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
mjpegtools/repos/testing-i686/
mjpegtools/repos/testing-i686/PKGBUILD
(from rev 144394, mjpegtools/trunk/PKGBUILD)
mjpegtools/repos/testing-i686/mjpegtools-v4l-2.6.38.patch
(from rev 144394, mjpegtools/trunk/mjpegtools-v4l-2.6.38.patch)
mjpegtools/repos/testing-i686/mjpegtools.install
(from rev 144394, mjpegtools/trunk/mjpegtools.install)
mjpegtools/repos/testing-x86_64/
mjpegtools/repos/testing-x86_64/PKGBUILD
(from rev 144394, mjpegtools/trunk/PKGBUILD)
mjpegtools/repos/testing-x86_64/mjpegtools-v4l-2.6.38.patch
(from rev 144394, mjpegtools/trunk/mjpegtools-v4l-2.6.38.patch)
mjpegtools/repos/testing-x86_64/mjpegtools.install
(from rev 144394, mjpegtools/trunk/mjpegtools.install)
--------------------------------------------+
testing-i686/PKGBUILD | 35 +++++++++
testing-i686/mjpegtools-v4l-2.6.38.patch | 100 +++++++++++++++++++++++++++
testing-i686/mjpegtools.install | 14 +++
testing-x86_64/PKGBUILD | 35 +++++++++
testing-x86_64/mjpegtools-v4l-2.6.38.patch | 100 +++++++++++++++++++++++++++
testing-x86_64/mjpegtools.install | 14 +++
6 files changed, 298 insertions(+)
Copied: mjpegtools/repos/testing-i686/PKGBUILD (from rev 144394,
mjpegtools/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2011-12-05 14:03:03 UTC (rev 144395)
@@ -0,0 +1,35 @@
+# $Id$
+# Contributor: Damir Perisa <[email protected]>
+# Mantainer: Roberto Carvajal <[email protected]>
+
+pkgname=mjpegtools
+pkgver=2.0.0
+pkgrel=1
+pkgdesc="Set of tools that can do recording of videos and playback, simple
cut-and-paste editing and the MPEG compression of audio and video"
+arch=(i686 x86_64)
+license=('GPL')
+url="http://mjpeg.sourceforge.net/";
+depends=('libjpeg' 'libpng' 'sdl' 'gcc-libs' 'libdv' 'texinfo')
+makedepends=('gtk2' 'v4l-utils')
+optdepends=('gtk2: glav GUI')
+options=('!makeflags' '!libtool')
+install=mjpegtools.install
+source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz
+ mjpegtools-v4l-2.6.38.patch)
+md5sums=('903e1e3b967eebcc5fe5626d7517dc46')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np0 -i "${srcdir}/mjpegtools-v4l-2.6.38.patch"
+ sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
+ ./configure --prefix=/usr --enable-largefile
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -m644 mpeg2enc/mpeg2syntaxcodes.h
"${pkgdir}/usr/include/mjpegtools/mpeg2enc/"
+}
+md5sums=('903e1e3b967eebcc5fe5626d7517dc46'
+ '44006d6f844017fe57aa123aa43f4508')
Copied: mjpegtools/repos/testing-i686/mjpegtools-v4l-2.6.38.patch (from rev
144394, mjpegtools/trunk/mjpegtools-v4l-2.6.38.patch)
===================================================================
--- testing-i686/mjpegtools-v4l-2.6.38.patch (rev 0)
+++ testing-i686/mjpegtools-v4l-2.6.38.patch 2011-12-05 14:03:03 UTC (rev
144395)
@@ -0,0 +1,100 @@
+Index: lavtools/lavvideo.c
+===================================================================
+--- lavtools/lavvideo.c.orig
++++ lavtools/lavvideo.c
+@@ -63,7 +63,7 @@ Copyright by Gernot Ziegler.
+ * errors here, check your linux/time.h && sys/time.h header setup.
+ */
+ #define _LINUX_TIME_H
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
+
+ #include <videodev_mjpeg.h>
+ #include <frequencies.h>
+Index: lavtools/liblavplay.c
+===================================================================
+--- lavtools/liblavplay.c.orig
++++ lavtools/liblavplay.c
+@@ -68,7 +68,8 @@
+ * errors here, check your linux/time.h && sys/time.h header setup.
+ */
+ #define _LINUX_TIME_H
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
++#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */
+ #else
+ #define VIDEO_MODE_PAL 0
+ #define VIDEO_MODE_NTSC 1
+Index: lavtools/liblavrec.c
+===================================================================
+--- lavtools/liblavrec.c.orig
++++ lavtools/liblavrec.c
+@@ -63,7 +63,8 @@
+ * errors here, check your linux/time.h && sys/time.h header setup.
+ */
+ #define _LINUX_TIME_H
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
++#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */
+ #ifdef HAVE_SYS_SOUNDCARD_H
+ #include <sys/soundcard.h>
+ #endif
+Index: lavtools/testrec.c
+===================================================================
+--- lavtools/testrec.c.orig
++++ lavtools/testrec.c
+@@ -89,7 +89,7 @@
+ * errors here, check your linux/time.h && sys/time.h header setup.
+ */
+ #define _LINUX_TIME_H
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
+ #include <linux/soundcard.h>
+
+ /* These are explicit prototypes for the compiler, to prepare separation of
audiolib.c */
+Index: configure.ac
+===================================================================
+--- configure.ac.orig
++++ configure.ac
+@@ -164,7 +164,7 @@ AC_ARG_WITH([v4l], AC_HELP_STRING([--wit
+ AS_IF([test "x$with_v4l" != "xno"], [
+ case $host in
+ *-*-linux*)
+- AC_CHECK_HEADER(linux/videodev.h,
++ AC_CHECK_HEADER(libv4l1-videodev.h,
+ [have_video4linux=true
+ AC_DEFINE(HAVE_V4L, 1,
+ [Building for Linux - using the video4linux
API])], [])
+@@ -173,7 +173,7 @@ esac])
+
+ AS_IF([test "x$have_video4linux" != "xtrue" && test "x$with_v4l" != "xno"],
+ [have_video4linux=false
+- AC_MSG_WARN([videodev.h not found - please install the linux kernel
headers programms needing v4l disabled])])
++ AC_MSG_WARN([libv4l1-videodev.h not found - please install the linux
kernel headers programms needing v4l disabled])])
+ AM_CONDITIONAL(HAVE_V4L, test x$have_video4linux = xtrue)
+
+ dnl *********************************************************************
+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -16392,7 +16392,7 @@ if test "x$with_v4l" != "xno"; then :
+
+ case $host in
+ *-*-linux*)
+- ac_fn_c_check_header_mongrel "$LINENO" "linux/videodev.h"
"ac_cv_header_linux_videodev_h" "$ac_includes_default"
++ ac_fn_c_check_header_mongrel "$LINENO" "libv4l1-videodev.h"
"ac_cv_header_linux_videodev_h" "$ac_includes_default"
+ if test "x$ac_cv_header_linux_videodev_h" = xyes; then :
+ have_video4linux=true
+
+@@ -16407,8 +16407,8 @@ fi
+
+ if test "x$have_video4linux" != "xtrue" && test "x$with_v4l" != "xno"; then :
+ have_video4linux=false
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: videodev.h not found
- please install the linux kernel headers programms needing v4l disabled" >&5
+-$as_echo "$as_me: WARNING: videodev.h not found - please install the linux
kernel headers programms needing v4l disabled" >&2;}
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libv4l1-videodev.h
not found - please install the linux kernel headers programms needing v4l
disabled" >&5
++$as_echo "$as_me: WARNING: libv4l1-videodev.h not found - please install the
linux kernel headers programms needing v4l disabled" >&2;}
+ fi
+ if test x$have_video4linux = xtrue; then
+ HAVE_V4L_TRUE=
Copied: mjpegtools/repos/testing-i686/mjpegtools.install (from rev 144394,
mjpegtools/trunk/mjpegtools.install)
===================================================================
--- testing-i686/mjpegtools.install (rev 0)
+++ testing-i686/mjpegtools.install 2011-12-05 14:03:03 UTC (rev 144395)
@@ -0,0 +1,14 @@
+infodir=/usr/share/info
+file=mjpeg-howto.info
+
+post_install() {
+ install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+}
Copied: mjpegtools/repos/testing-x86_64/PKGBUILD (from rev 144394,
mjpegtools/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2011-12-05 14:03:03 UTC (rev 144395)
@@ -0,0 +1,35 @@
+# $Id$
+# Contributor: Damir Perisa <[email protected]>
+# Mantainer: Roberto Carvajal <[email protected]>
+
+pkgname=mjpegtools
+pkgver=2.0.0
+pkgrel=1
+pkgdesc="Set of tools that can do recording of videos and playback, simple
cut-and-paste editing and the MPEG compression of audio and video"
+arch=(i686 x86_64)
+license=('GPL')
+url="http://mjpeg.sourceforge.net/";
+depends=('libjpeg' 'libpng' 'sdl' 'gcc-libs' 'libdv' 'texinfo')
+makedepends=('gtk2' 'v4l-utils')
+optdepends=('gtk2: glav GUI')
+options=('!makeflags' '!libtool')
+install=mjpegtools.install
+source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz
+ mjpegtools-v4l-2.6.38.patch)
+md5sums=('903e1e3b967eebcc5fe5626d7517dc46')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np0 -i "${srcdir}/mjpegtools-v4l-2.6.38.patch"
+ sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
+ ./configure --prefix=/usr --enable-largefile
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -m644 mpeg2enc/mpeg2syntaxcodes.h
"${pkgdir}/usr/include/mjpegtools/mpeg2enc/"
+}
+md5sums=('903e1e3b967eebcc5fe5626d7517dc46'
+ '44006d6f844017fe57aa123aa43f4508')
Copied: mjpegtools/repos/testing-x86_64/mjpegtools-v4l-2.6.38.patch (from rev
144394, mjpegtools/trunk/mjpegtools-v4l-2.6.38.patch)
===================================================================
--- testing-x86_64/mjpegtools-v4l-2.6.38.patch (rev 0)
+++ testing-x86_64/mjpegtools-v4l-2.6.38.patch 2011-12-05 14:03:03 UTC (rev
144395)
@@ -0,0 +1,100 @@
+Index: lavtools/lavvideo.c
+===================================================================
+--- lavtools/lavvideo.c.orig
++++ lavtools/lavvideo.c
+@@ -63,7 +63,7 @@ Copyright by Gernot Ziegler.
+ * errors here, check your linux/time.h && sys/time.h header setup.
+ */
+ #define _LINUX_TIME_H
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
+
+ #include <videodev_mjpeg.h>
+ #include <frequencies.h>
+Index: lavtools/liblavplay.c
+===================================================================
+--- lavtools/liblavplay.c.orig
++++ lavtools/liblavplay.c
+@@ -68,7 +68,8 @@
+ * errors here, check your linux/time.h && sys/time.h header setup.
+ */
+ #define _LINUX_TIME_H
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
++#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */
+ #else
+ #define VIDEO_MODE_PAL 0
+ #define VIDEO_MODE_NTSC 1
+Index: lavtools/liblavrec.c
+===================================================================
+--- lavtools/liblavrec.c.orig
++++ lavtools/liblavrec.c
+@@ -63,7 +63,8 @@
+ * errors here, check your linux/time.h && sys/time.h header setup.
+ */
+ #define _LINUX_TIME_H
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
++#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */
+ #ifdef HAVE_SYS_SOUNDCARD_H
+ #include <sys/soundcard.h>
+ #endif
+Index: lavtools/testrec.c
+===================================================================
+--- lavtools/testrec.c.orig
++++ lavtools/testrec.c
+@@ -89,7 +89,7 @@
+ * errors here, check your linux/time.h && sys/time.h header setup.
+ */
+ #define _LINUX_TIME_H
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
+ #include <linux/soundcard.h>
+
+ /* These are explicit prototypes for the compiler, to prepare separation of
audiolib.c */
+Index: configure.ac
+===================================================================
+--- configure.ac.orig
++++ configure.ac
+@@ -164,7 +164,7 @@ AC_ARG_WITH([v4l], AC_HELP_STRING([--wit
+ AS_IF([test "x$with_v4l" != "xno"], [
+ case $host in
+ *-*-linux*)
+- AC_CHECK_HEADER(linux/videodev.h,
++ AC_CHECK_HEADER(libv4l1-videodev.h,
+ [have_video4linux=true
+ AC_DEFINE(HAVE_V4L, 1,
+ [Building for Linux - using the video4linux
API])], [])
+@@ -173,7 +173,7 @@ esac])
+
+ AS_IF([test "x$have_video4linux" != "xtrue" && test "x$with_v4l" != "xno"],
+ [have_video4linux=false
+- AC_MSG_WARN([videodev.h not found - please install the linux kernel
headers programms needing v4l disabled])])
++ AC_MSG_WARN([libv4l1-videodev.h not found - please install the linux
kernel headers programms needing v4l disabled])])
+ AM_CONDITIONAL(HAVE_V4L, test x$have_video4linux = xtrue)
+
+ dnl *********************************************************************
+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -16392,7 +16392,7 @@ if test "x$with_v4l" != "xno"; then :
+
+ case $host in
+ *-*-linux*)
+- ac_fn_c_check_header_mongrel "$LINENO" "linux/videodev.h"
"ac_cv_header_linux_videodev_h" "$ac_includes_default"
++ ac_fn_c_check_header_mongrel "$LINENO" "libv4l1-videodev.h"
"ac_cv_header_linux_videodev_h" "$ac_includes_default"
+ if test "x$ac_cv_header_linux_videodev_h" = xyes; then :
+ have_video4linux=true
+
+@@ -16407,8 +16407,8 @@ fi
+
+ if test "x$have_video4linux" != "xtrue" && test "x$with_v4l" != "xno"; then :
+ have_video4linux=false
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: videodev.h not found
- please install the linux kernel headers programms needing v4l disabled" >&5
+-$as_echo "$as_me: WARNING: videodev.h not found - please install the linux
kernel headers programms needing v4l disabled" >&2;}
++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libv4l1-videodev.h
not found - please install the linux kernel headers programms needing v4l
disabled" >&5
++$as_echo "$as_me: WARNING: libv4l1-videodev.h not found - please install the
linux kernel headers programms needing v4l disabled" >&2;}
+ fi
+ if test x$have_video4linux = xtrue; then
+ HAVE_V4L_TRUE=
Copied: mjpegtools/repos/testing-x86_64/mjpegtools.install (from rev 144394,
mjpegtools/trunk/mjpegtools.install)
===================================================================
--- testing-x86_64/mjpegtools.install (rev 0)
+++ testing-x86_64/mjpegtools.install 2011-12-05 14:03:03 UTC (rev 144395)
@@ -0,0 +1,14 @@
+infodir=/usr/share/info
+file=mjpeg-howto.info
+
+post_install() {
+ install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+}
