Date: Monday, February 1, 2021 @ 10:34:42 Author: heftig Revision: 406988
2.2.0 (needs rebuilds) Modified: mjpegtools/trunk/PKGBUILD mjpegtools/trunk/mjpegtools-v4l-2.6.38.patch Deleted: mjpegtools/trunk/mjpegtools-2.0.0-gcc470.patch -------------------------------+ PKGBUILD | 35 ++++++++++++++++------------------- mjpegtools-2.0.0-gcc470.patch | 11 ----------- mjpegtools-v4l-2.6.38.patch | 20 -------------------- 3 files changed, 16 insertions(+), 50 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-02-01 09:40:35 UTC (rev 406987) +++ PKGBUILD 2021-02-01 10:34:42 UTC (rev 406988) @@ -1,33 +1,30 @@ +# Contributor: Roberto Carvajal <[email protected]> # Contributor: Damir Perisa <[email protected]> -# Maintainer: Roberto Carvajal <[email protected]> pkgname=mjpegtools -pkgver=2.1.0 -pkgrel=5 -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=(https://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz) -md5sums=('57bf5dd78976ca9bac972a6511b236f3') +pkgver=2.2.0beta +pkgrel=1 +pkgdesc="Video capture, editing, playback, and compression to MPEG of MJPEG video" +url="https://mjpeg.sourceforge.io/"; +arch=(x86_64) +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') prepare() { - cd ${pkgname}-${pkgver} - sed -i -e '/ARCHFLAGS=/s:=.*:=:' -e 's/-fno-PIC//' configure + cd ${pkgname} } build() { - cd ${pkgname}-${pkgver} - ./configure --prefix=/usr --enable-largefile + cd ${pkgname} + ./configure --prefix=/usr make } package() { - cd ${pkgname}-${pkgver} + cd ${pkgname} 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 2021-02-01 09:40:35 UTC (rev 406987) +++ mjpegtools-2.0.0-gcc470.patch 2021-02-01 10:34:42 UTC (rev 406988) @@ -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 - { Modified: mjpegtools-v4l-2.6.38.patch =================================================================== --- mjpegtools-v4l-2.6.38.patch 2021-02-01 09:40:35 UTC (rev 406987) +++ mjpegtools-v4l-2.6.38.patch 2021-02-01 10:34:42 UTC (rev 406988) @@ -65,15 +65,6 @@ [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 @@ -87,14 +78,3 @@ 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=
