[arch-commits] Commit in mjpegtools/trunk (PKGBUILD mjpegtools-v4l-2.6.38.patch)

[Antonio Rojas]

    Date: Tuesday, May 4, 2021 @ 19:39:40
  Author: arojas
Revision: 414380

Update to 2.2.0

Modified:
  mjpegtools/trunk/PKGBUILD
Deleted:
  mjpegtools/trunk/mjpegtools-v4l-2.6.38.patch

-----------------------------+
 PKGBUILD                    |   15 ++-----
 mjpegtools-v4l-2.6.38.patch |   80 ------------------------------------------
 2 files changed, 5 insertions(+), 90 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-04 19:02:39 UTC (rev 414379)
+++ PKGBUILD	2021-05-04 19:39:40 UTC (rev 414380)
@@ -2,7 +2,7 @@
 # Contributor: Damir Perisa <damir.perisa at bluewin.ch>
 
 pkgname=mjpegtools
-pkgver=2.2.0beta
+pkgver=2.2.0
 pkgrel=1
 pkgdesc="Video capture, editing, playback, and compression to MPEG of MJPEG video"
 url="https://mjpeg.sourceforge.io/"
@@ -10,21 +10,16 @@
 license=(GPL)
 depends=(libjpeg libpng gcc-libs libdv)
 makedepends=(v4l-utils)
-_pkgver=${pkgver/beta/_beta}
-source=(https://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${_pkgver}.tar.gz)
-md5sums=('c4591bd8ffcf54b77fa8633ac11d9fae')
+source=(https://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('a84349839471052db1ef691134aacf905b314dfce8762d47e10edcc9ab5f97d8')
 
-prepare() {
-  cd ${pkgname}
-}
-
 build() {
-  cd ${pkgname}
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd ${pkgname}
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }

Deleted: mjpegtools-v4l-2.6.38.patch
===================================================================
--- mjpegtools-v4l-2.6.38.patch	2021-05-04 19:02:39 UTC (rev 414379)
+++ mjpegtools-v4l-2.6.38.patch	2021-05-04 19:39:40 UTC (rev 414380)
@@ -1,80 +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])], [])
-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
-