[arch-commits] Commit in mjpegtools/repos/extra-x86_64 (6 files)

Antonio Rojas arojas at archlinux.org
Sat Nov 24 08:51:14 UTC 2018


    Date: Saturday, November 24, 2018 @ 08:51:13
  Author: arojas
Revision: 340365

archrelease: copy trunk to extra-x86_64

Added:
  mjpegtools/repos/extra-x86_64/PKGBUILD
    (from rev 340364, mjpegtools/trunk/PKGBUILD)
  mjpegtools/repos/extra-x86_64/mjpegtools-2.0.0-gcc470.patch
    (from rev 340364, mjpegtools/trunk/mjpegtools-2.0.0-gcc470.patch)
  mjpegtools/repos/extra-x86_64/mjpegtools-v4l-2.6.38.patch
    (from rev 340364, mjpegtools/trunk/mjpegtools-v4l-2.6.38.patch)
Deleted:
  mjpegtools/repos/extra-x86_64/PKGBUILD
  mjpegtools/repos/extra-x86_64/mjpegtools-2.0.0-gcc470.patch
  mjpegtools/repos/extra-x86_64/mjpegtools-v4l-2.6.38.patch

-------------------------------+
 PKGBUILD                      |   67 ++++++-------
 mjpegtools-2.0.0-gcc470.patch |   22 ++--
 mjpegtools-v4l-2.6.38.patch   |  200 ++++++++++++++++++++--------------------
 3 files changed, 144 insertions(+), 145 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-24 08:50:45 UTC (rev 340364)
+++ PKGBUILD	2018-11-24 08:51:13 UTC (rev 340365)
@@ -1,34 +0,0 @@
-# $Id$
-# Contributor: Damir Perisa <damir.perisa at bluewin.ch>
-# Maintainer: Roberto Carvajal <roberto at archlinux.org>
-
-pkgname=mjpegtools
-pkgver=2.1.0
-pkgrel=3
-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')
-makedepends=('gtk2' 'v4l-utils')
-optdepends=('gtk2: glav GUI')
-options=('!makeflags')
-source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz)
-md5sums=('57bf5dd78976ca9bac972a6511b236f3')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
-}
-
-build() {
-  cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr --enable-largefile
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-  install -m644 mpeg2enc/mpeg2syntaxcodes.h "${pkgdir}/usr/include/mjpegtools/mpeg2enc/"
-}

Copied: mjpegtools/repos/extra-x86_64/PKGBUILD (from rev 340364, mjpegtools/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-11-24 08:51:13 UTC (rev 340365)
@@ -0,0 +1,33 @@
+# Contributor: Damir Perisa <damir.perisa at bluewin.ch>
+# Maintainer: Roberto Carvajal <roberto at archlinux.org>
+
+pkgname=mjpegtools
+pkgver=2.1.0
+pkgrel=4
+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=('x86_64')
+license=('GPL')
+url="http://mjpeg.sourceforge.net/"
+depends=('libjpeg' 'libpng' 'sdl' 'gcc-libs' 'libdv')
+makedepends=('gtk2' 'v4l-utils')
+optdepends=('gtk2: glav GUI')
+options=('!makeflags')
+source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz)
+md5sums=('57bf5dd78976ca9bac972a6511b236f3')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  sed -i -e '/ARCHFLAGS=/s:=.*:=:' -e 's/-fno-PIC//' configure
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr --enable-largefile
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  install -m644 mpeg2enc/mpeg2syntaxcodes.h "${pkgdir}/usr/include/mjpegtools/mpeg2enc/"
+}

Deleted: mjpegtools-2.0.0-gcc470.patch
===================================================================
--- mjpegtools-2.0.0-gcc470.patch	2018-11-24 08:50:45 UTC (rev 340364)
+++ mjpegtools-2.0.0-gcc470.patch	2018-11-24 08:51:13 UTC (rev 340365)
@@ -1,11 +0,0 @@
---- a/y4mdenoise/MotionSearcher.hh
-+++ b/y4mdenoise/MotionSearcher.hh
-@@ -2196,7 +2196,7 @@
- 	{
- 		// This region is too small to be bothered with.
- 		// Just get rid of it.
--		DeleteRegion (a_pRegion);
-+		this->DeleteRegion (a_pRegion);
- 	}
- 	else
- 	{

Copied: mjpegtools/repos/extra-x86_64/mjpegtools-2.0.0-gcc470.patch (from rev 340364, mjpegtools/trunk/mjpegtools-2.0.0-gcc470.patch)
===================================================================
--- mjpegtools-2.0.0-gcc470.patch	                        (rev 0)
+++ mjpegtools-2.0.0-gcc470.patch	2018-11-24 08:51:13 UTC (rev 340365)
@@ -0,0 +1,11 @@
+--- a/y4mdenoise/MotionSearcher.hh
++++ b/y4mdenoise/MotionSearcher.hh
+@@ -2196,7 +2196,7 @@
+ 	{
+ 		// This region is too small to be bothered with.
+ 		// Just get rid of it.
+-		DeleteRegion (a_pRegion);
++		this->DeleteRegion (a_pRegion);
+ 	}
+ 	else
+ 	{

Deleted: mjpegtools-v4l-2.6.38.patch
===================================================================
--- mjpegtools-v4l-2.6.38.patch	2018-11-24 08:50:45 UTC (rev 340364)
+++ mjpegtools-v4l-2.6.38.patch	2018-11-24 08:51:13 UTC (rev 340365)
@@ -1,100 +0,0 @@
-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/extra-x86_64/mjpegtools-v4l-2.6.38.patch (from rev 340364, mjpegtools/trunk/mjpegtools-v4l-2.6.38.patch)
===================================================================
--- mjpegtools-v4l-2.6.38.patch	                        (rev 0)
+++ mjpegtools-v4l-2.6.38.patch	2018-11-24 08:51:13 UTC (rev 340365)
@@ -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=


More information about the arch-commits mailing list