Browse Source

git subrepo clone gitea@gitea.artixlinux.org:packagesM/mjpegtools.git

subrepo:
  subdir:   "mjpegtools"
  merged:   "2b5e45f"
upstream:
  origin:   "gitea@gitea.artixlinux.org:packagesM/mjpegtools.git"
  branch:   "master"
  commit:   "2b5e45f"
git-subrepo:
  version:  "0.4.0"
  origin:   "???"
  commit:   "???"
master
artoo 2 years ago
parent
commit
c032476261
Signed by: artoo GPG Key ID: 3292CD0BB0DB310B
  1. 5
      mjpegtools/.artixlinux/agent.yaml
  2. 33
      mjpegtools/.gitignore
  3. 12
      mjpegtools/.gitrepo
  4. 3
      mjpegtools/Jenkinsfile
  5. 2
      mjpegtools/README.md
  6. 33
      mjpegtools/repos/extra-x86_64/PKGBUILD
  7. 11
      mjpegtools/repos/extra-x86_64/mjpegtools-2.0.0-gcc470.patch
  8. 100
      mjpegtools/repos/extra-x86_64/mjpegtools-v4l-2.6.38.patch
  9. 33
      mjpegtools/trunk/PKGBUILD
  10. 11
      mjpegtools/trunk/mjpegtools-2.0.0-gcc470.patch
  11. 100
      mjpegtools/trunk/mjpegtools-v4l-2.6.38.patch

5
mjpegtools/.artixlinux/agent.yaml

@ -0,0 +1,5 @@
%YAML 1.2
---
label: master

33
mjpegtools/.gitignore

@ -0,0 +1,33 @@
# ---> ArchLinuxPackages
*.tar
*.tar.*
*.jar
*.exe
*.msi
*.zip
*.tgz
*.log
*.log.*
*.sig
pkg/
src/
# ---> Archives
*.7z
*.rar
*.gz
*.bzip
*.bz2
*.xz
*.lzma
*.cab
# ---> systemd
*.service
*.socket
*.timer
# ---> snap
*.snap

12
mjpegtools/.gitrepo

@ -0,0 +1,12 @@
; DO NOT EDIT (unless you know what you are doing)
;
; This subdirectory is a git "subrepo", and this file is maintained by the
; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme
;
[subrepo]
remote = gitea@gitea.artixlinux.org:packagesM/mjpegtools.git
branch = master
commit = 2b5e45f2e07b2f4b723390a86e14dea67dfa3d1e
parent = 7d0a89ee79042cde7749d69b5536c1cb30e3f35d
method = merge
cmdver = 0.4.0

3
mjpegtools/Jenkinsfile

@ -0,0 +1,3 @@
@Library('artix-ci') import org.artixlinux.RepoPackage
PackagePipeline(new RepoPackage(this))

2
mjpegtools/README.md

@ -0,0 +1,2 @@
# mjpegtools

33
mjpegtools/repos/extra-x86_64/PKGBUILD

@ -0,0 +1,33 @@
# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
# Maintainer: Roberto Carvajal <roberto@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/"
}

11
mjpegtools/repos/extra-x86_64/mjpegtools-2.0.0-gcc470.patch

@ -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
{

100
mjpegtools/repos/extra-x86_64/mjpegtools-v4l-2.6.38.patch

@ -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=

33
mjpegtools/trunk/PKGBUILD

@ -0,0 +1,33 @@
# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
# Maintainer: Roberto Carvajal <roberto@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/"
}

11
mjpegtools/trunk/mjpegtools-2.0.0-gcc470.patch

@ -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
{

100
mjpegtools/trunk/mjpegtools-v4l-2.6.38.patch

@ -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=
Loading…
Cancel
Save