commit bd1265331661bbbe0d8e39e18f644bb6715718e63531d5cc48939e07307efaf8 Author: Adrian Schröter Date: Fri May 3 16:46:19 2024 +0200 Sync from SUSE:SLFO:Main mjpegtools revision 3757c64614615f39bd623b9e8f7fafc7 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/baselibs.conf b/baselibs.conf new file mode 100644 index 0000000..90a8a36 --- /dev/null +++ b/baselibs.conf @@ -0,0 +1,3 @@ +libmjpegutils-2_2-0 +libmpeg2encpp-2_2-0 +libmplex2-2_2-0 diff --git a/mjpegtools-2.0.0-fix-bashisms.patch b/mjpegtools-2.0.0-fix-bashisms.patch new file mode 100644 index 0000000..0e346e1 --- /dev/null +++ b/mjpegtools-2.0.0-fix-bashisms.patch @@ -0,0 +1,31 @@ +diff -Ndur mjpegtools-2.0.0/scripts/lav2avi.sh mjpegtools-2.0.0-fix-bashisms/scripts/lav2avi.sh +--- mjpegtools-2.0.0/scripts/lav2avi.sh 2004-08-07 05:51:14.000000000 +0300 ++++ mjpegtools-2.0.0-fix-bashisms/scripts/lav2avi.sh 2014-11-29 22:02:38.363918541 +0200 +@@ -72,7 +72,11 @@ + } + + if [ $usage -eq 1 ]; then +- echo -e "USAGE:\t`basename $0` filename.eli" +- echo -e "\n\tfilename - MJPEG Tools lav editing file\n" +- echo -e "EXAMPLE:\n\t`basename $0` SecondFilm.eli\n" ++ echo "USAGE: `basename $0` filename.eli" ++ echo ++ echo " filename - MJPEG Tools lav editing file" ++ echo ++ echo "EXAMPLE:" ++ echo " `basename $0` SecondFilm.eli" ++ echo + fi +diff -Ndur mjpegtools-2.0.0/scripts/lav2mpeg mjpegtools-2.0.0-fix-bashisms/scripts/lav2mpeg +--- mjpegtools-2.0.0/scripts/lav2mpeg 2009-01-23 17:52:25.000000000 +0200 ++++ mjpegtools-2.0.0-fix-bashisms/scripts/lav2mpeg 2014-11-29 22:03:59.200913072 +0200 +@@ -252,7 +252,7 @@ + ;; + esac + done +-let MOPTIND=OPTIND-LAVRC_COUNT ++MOPTIND=$((OPTIND - LAVRC_COUNT)) + shift `expr $MOPTIND - 1` + + if [ "${QUIETLOG}" != "" ]; then + diff --git a/mjpegtools-2.2.1.tar.bz2 b/mjpegtools-2.2.1.tar.bz2 new file mode 100644 index 0000000..f0aad2d --- /dev/null +++ b/mjpegtools-2.2.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b180536d7d9960b05e0023a197b00dcb100929a49aab71d19d55f4a1b210f49a +size 2326425 diff --git a/mjpegtools-getopt.patch b/mjpegtools-getopt.patch new file mode 100644 index 0000000..920eb03 --- /dev/null +++ b/mjpegtools-getopt.patch @@ -0,0 +1,24 @@ +diff -ur mjpegtools-2.0.0.orig/y4mdenoise/main.c mjpegtools-2.0.0/y4mdenoise/main.c +--- mjpegtools-2.0.0.orig/y4mdenoise/main.c 2010-07-25 22:06:56.000000000 +0200 ++++ mjpegtools-2.0.0/y4mdenoise/main.c 2011-05-28 14:52:21.763767632 +0200 +@@ -274,7 +274,7 @@ + void + process_commandline(int argc, char *argv[]) + { +- char c; ++ int c; + + while ((c = getopt (argc, argv, "h?z:Z:t:T:r:R:m:M:f:BI:p:v:")) != -1) + { +diff -ur mjpegtools-2.0.0.orig/yuvdeinterlace/yuvdeinterlace.cc mjpegtools-2.0.0/yuvdeinterlace/yuvdeinterlace.cc +--- mjpegtools-2.0.0.orig/yuvdeinterlace/yuvdeinterlace.cc 2009-09-19 20:16:47.000000000 +0200 ++++ mjpegtools-2.0.0/yuvdeinterlace/yuvdeinterlace.cc 2011-05-28 14:53:14.191273843 +0200 +@@ -923,7 +923,7 @@ + + deinterlacer YUVdeint; + +- char c; ++ int c; + + YUVdeint.field_order = -1; + diff --git a/mjpegtools-v4l-2.6.38.patch b/mjpegtools-v4l-2.6.38.patch new file mode 100644 index 0000000..6da89fc --- /dev/null +++ b/mjpegtools-v4l-2.6.38.patch @@ -0,0 +1,81 @@ +Index: mjpegtools-2.2.0/lavtools/lavvideo.c +=================================================================== +--- mjpegtools-2.2.0.orig/lavtools/lavvideo.c 2021-02-11 07:02:26.000000000 +0100 ++++ mjpegtools-2.2.0/lavtools/lavvideo.c 2021-05-11 12:24:57.188741183 +0200 +@@ -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 ++#include + + #include + #include +Index: mjpegtools-2.2.0/lavtools/liblavplay.c +=================================================================== +--- mjpegtools-2.2.0.orig/lavtools/liblavplay.c 2021-02-11 07:02:26.000000000 +0100 ++++ mjpegtools-2.2.0/lavtools/liblavplay.c 2021-05-11 12:24:57.188741183 +0200 +@@ -68,7 +68,8 @@ + * errors here, check your linux/time.h && sys/time.h header setup. + */ + #define _LINUX_TIME_H +-#include ++#include ++#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */ + #else + #define VIDEO_MODE_PAL 0 + #define VIDEO_MODE_NTSC 1 +Index: mjpegtools-2.2.0/lavtools/liblavrec.c +=================================================================== +--- mjpegtools-2.2.0.orig/lavtools/liblavrec.c 2021-02-11 07:02:26.000000000 +0100 ++++ mjpegtools-2.2.0/lavtools/liblavrec.c 2021-05-11 12:25:27.076907401 +0200 +@@ -63,7 +63,9 @@ + * errors here, check your linux/time.h && sys/time.h header setup. + */ + #define _LINUX_TIME_H +-#include ++#include ++#include ++#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */ + #ifdef HAVE_SYS_SOUNDCARD_H + #include + #endif +Index: mjpegtools-2.2.0/lavtools/testrec.c +=================================================================== +--- mjpegtools-2.2.0.orig/lavtools/testrec.c 2021-02-11 07:02:26.000000000 +0100 ++++ mjpegtools-2.2.0/lavtools/testrec.c 2021-05-11 12:24:57.192741206 +0200 +@@ -89,7 +89,7 @@ + * errors here, check your linux/time.h && sys/time.h header setup. + */ + #define _LINUX_TIME_H +-#include ++#include + #include + + /* These are explicit prototypes for the compiler, to prepare separation of audiolib.c */ +Index: mjpegtools-2.2.0/configure.ac +=================================================================== +--- mjpegtools-2.2.0.orig/configure.ac 2021-02-11 06:09:59.000000000 +0100 ++++ mjpegtools-2.2.0/configure.ac 2021-05-11 12:24:57.192741206 +0200 +@@ -153,7 +153,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: mjpegtools-2.2.0/configure +=================================================================== +--- mjpegtools-2.2.0.orig/configure 2021-02-11 06:23:37.000000000 +0100 ++++ mjpegtools-2.2.0/configure 2021-05-11 12:24:57.192741206 +0200 +@@ -17764,7 +17764,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 + diff --git a/mjpegtools-vector_alignment.patch b/mjpegtools-vector_alignment.patch new file mode 100644 index 0000000..6e98b0d --- /dev/null +++ b/mjpegtools-vector_alignment.patch @@ -0,0 +1,57 @@ +--- + mpeg2enc/imageplanes.cc | 11 +++++++---- + mpeg2enc/imageplanes.hh | 1 + + 2 files changed, 8 insertions(+), 4 deletions(-) + +Index: mjpegtools-2.2.0/mpeg2enc/imageplanes.cc +=================================================================== +--- mjpegtools-2.2.0.orig/mpeg2enc/imageplanes.cc 2021-02-11 07:02:26.000000000 +0100 ++++ mjpegtools-2.2.0/mpeg2enc/imageplanes.cc 2021-05-11 12:30:02.082436818 +0200 +@@ -19,19 +19,22 @@ ImagePlanes::ImagePlanes( EncoderParams + switch( c ) + { + case 0 : // Y plane +- planes[c] = new uint8_t[encparams.lum_buffer_size]; ++ raw_planes[c] = new uint8_t[encparams.lum_buffer_size + 0x10]; ++ planes[c] = (uint8_t *)((((unsigned long)raw_planes[c]) + 0x10) & ~0xf); + BorderMark( planes[c] , + encparams.enc_width,encparams.enc_height, + encparams.phy_width,encparams.phy_height); + break; + case 1 : // U plane + case 2 : // V plane +- planes[c] = new uint8_t[encparams.chrom_buffer_size]; ++ raw_planes[c] = new uint8_t[encparams.chrom_buffer_size + 0x10]; ++ planes[c] = (uint8_t *)((((unsigned long)raw_planes[c]) + 0x10) & ~0xf); + BorderMark( planes[c], + encparams.enc_chrom_width, encparams.enc_chrom_height, + encparams.phy_chrom_width,encparams.phy_chrom_height); + break; + default : // TODO: shift Y subsampled data from appended in Y buffer to seperate planes ++ raw_planes[c] = 0; + planes[c] = 0; + break; + } +@@ -43,8 +46,8 @@ ImagePlanes::ImagePlanes( EncoderParams + { + for( int c = 0; c < NUM_PLANES; ++c ) + { +- if( planes[c] != 0 ) +- delete [] planes[c]; ++ if( raw_planes[c] != 0 ) ++ delete [] raw_planes[c]; + } + DiscardUserData(); + } +Index: mjpegtools-2.2.0/mpeg2enc/imageplanes.hh +=================================================================== +--- mjpegtools-2.2.0.orig/mpeg2enc/imageplanes.hh 2021-02-11 07:02:26.000000000 +0100 ++++ mjpegtools-2.2.0/mpeg2enc/imageplanes.hh 2021-05-11 12:30:02.082436818 +0200 +@@ -55,6 +55,7 @@ class ImagePlanes + int image_data_width, int image_data_height); + protected: + uint8_t *planes[NUM_PLANES]; ++ uint8_t *raw_planes[NUM_PLANES]; + }; + + diff --git a/mjpegtools-writeable_strings.patch b/mjpegtools-writeable_strings.patch new file mode 100644 index 0000000..6d63bde --- /dev/null +++ b/mjpegtools-writeable_strings.patch @@ -0,0 +1,22 @@ +--- mjpegtools-1.9.0rc3/utils/motionsearch.h.fix 2008-06-25 11:12:55.000000000 +0200 ++++ mjpegtools-1.9.0rc3/utils/motionsearch.h 2008-06-25 11:13:45.000000000 +0200 +@@ -124,7 +124,7 @@ + extern "C" { + #endif + +-void init_motion_search(void), reset_motion_simd(char *); ++void init_motion_search(void), reset_motion_simd(const char *); + int round_search_radius( int radius ); + + #ifdef __cplusplus +--- mjpegtools-1.9.0rc3/utils/motionsearch.c.fix 2008-06-25 11:12:50.000000000 +0200 ++++ mjpegtools-1.9.0rc3/utils/motionsearch.c 2008-06-25 11:13:33.000000000 +0200 +@@ -1021,7 +1021,7 @@ + p##x = x; \ + } + +-void reset_motion_simd(char *name) ++void reset_motion_simd(const char *name) + { + SIMD_RESET(sad_00); + SIMD_RESET(sad_01); diff --git a/mjpegtools.changes b/mjpegtools.changes new file mode 100644 index 0000000..4d1fd7f --- /dev/null +++ b/mjpegtools.changes @@ -0,0 +1,500 @@ +------------------------------------------------------------------- +Mon May 16 18:01:58 UTC 2022 - Jan Engelhardt + +- mjpegtools's Makefiles try to use -lX11, but there is no + BuildRequire for it - add it. + +------------------------------------------------------------------- +Fri Oct 29 17:17:56 UTC 2021 - Bjørn Lie + +- Update to version 2.2.1 + * version bump to the official release + * various compile warnings fixes + +------------------------------------------------------------------- +Tue May 11 10:50:23 UTC 2021 - pgajdos@suse.com + +- version update to 2.2.0~beta +- modified patches + % mjpegtools-2.0.0-fix-bashisms.patch (refreshed) + % mjpegtools-v4l-2.6.38.patch (refreshed) + % mjpegtools-vector_alignment.patch (refreshed) +- modified sources + % baselibs.conf +- deleted patches + - mjpegtools-config_h.patch (upstreamed) + - mjpegtools-cpuinfo.patch (not needed) + - mjpegtools-gcc47.patch (upstreamed) + - mjpegtools-more-pie.patch (upstreamed) + - mjpegtools-no_arch_tuning.patch + +------------------------------------------------------------------- +Wed Aug 22 10:37:29 UTC 2018 - dimstar@opensuse.org + +- Inject pkg-config --cflags SDL_gfx into CFLAGS: the build system + does not use pkg-config yet to find the right parameters for + SDL_gfx, so we cheat like that. + +------------------------------------------------------------------- +Tue Mar 6 22:13:45 UTC 2018 - virtuousfox@gmail.com + +- Add libmplex2-2_0-0 to baselibs.conf for gstreamer-plugins-bad-32bit + forgotten in the previous change + +------------------------------------------------------------------- +Tue Mar 6 05:37:58 UTC 2018 - virtuousfox@gmail.com + +- Add libmpeg2encpp-2_0-0 to baselibs.conf for gstreamer-plugins-bad-32bit + which may be needed for wine's A/V support to function properly + +------------------------------------------------------------------- +Tue Feb 27 09:56:24 UTC 2018 - bjorn.lie@gmail.com + +- Split libmjpegutils-2_0-0 to follow openSUSE recommended + guidelines for libs: + + liblavfile-2_0-0 + + liblavjpeg-2_0-0 + + liblavplay-2_0-0 + + liblavrec-2_0-0 + + libmplex2-2_0-0 + + libmpeg2encpp-2_0-0 +- Run spec-cleaner, modernize spec slightly. +- Drop libmpeg2encpp-2_0-0 Obsoletes, package is added back. + +------------------------------------------------------------------- +Tue Feb 20 18:27:14 UTC 2018 - bjorn.lie@gmail.com + +- No longer use patched tarball for build, mpeg2 is now available + in openSUSE: + + Drop pre_checkin.sh, mjpegtools-codecpatch.sh and + mjpegtools-codecpatch.patch, no longer needed. + + Drop BUILD_ORIG and obsolete versions conditionals. + + Drop previously conditional mjpegtools-orig-addon and + libmpeg2encpp-2_0-0 subpackages. + + Update baselibs.conf for the new build structure. + + Add mjpegtools-orig-addon and libmpeg2encpp-2_0-0 Obsoletes: + Ensure a smooth upgrade for our users. + +------------------------------------------------------------------- +Tue Feb 20 16:04:41 UTC 2018 - bwiedemann@suse.com + +- Make source tarball generation reproducible (boo#1041090) + +------------------------------------------------------------------- +Sat Dec 30 22:41:59 UTC 2017 - zaitor@opensuse.org + +- Add conditional post(un) handling for libmpeg2encpp-2_0-0. + +------------------------------------------------------------------- +Tue Oct 31 16:36:27 UTC 2017 - zaitor@opensuse.org + +- Drop pkgconfig(gdk-x11-2.0), pkgconfig(gobject-2.0) and + pkgconfig(gtk+-x11-2.0) BuildRequires and pass --without-gtk, no + longer build gtk2 support. + +------------------------------------------------------------------- +Sun Apr 2 21:38:24 UTC 2017 - meissner@suse.com + +- mjpegtools-more-pie.patch: remove some -fno-PIC calls. They + do not seem to be necessary and break PIE builds. + (The compiler would warn if the assembler would not build.) + +------------------------------------------------------------------- +Fri Feb 24 11:12:26 UTC 2017 - zaitor@opensuse.org + +- Add mjpegtools Requires to mjpegtools-orig-addon, installing the + addon without having the package it "extends" is pointless. + +------------------------------------------------------------------- +Sat Feb 18 01:35:01 UTC 2017 - zaitor@opensuse.org + +- Split the package in smaller pieces, allowing as user to keep the + main/free parts from the distribution and 'enhancing' the + capability with simple addon-packages: libmpeg2encpp-2_0-0 (as a + library it is required by other code depending on it) and + mjpegtools-orig-addon, which is auto-recommended when the user + has mjpegtools installed AND has a repo enabled, containing this + package AND has recommends enabled. + +------------------------------------------------------------------- +Thu Jan 8 15:15:11 UTC 2015 - olaf@aepfle.de + +- BuildRequire at least libpng 1.14 due to usage of + PNG_TRANSFORM_GRAY_TO_RGB + +------------------------------------------------------------------- +Mon Dec 1 12:53:29 UTC 2014 - kstreitova@suse.com + +- Added baselibs.conf as a source in the spec file (to avoid error + message from the Factory check script). + +------------------------------------------------------------------- +Sat Nov 29 20:11:00 UTC 2013 - Led + +- fix bashisms in shell scripts +- fix shebang in lavtc.sh that contains bash-specific constructions +- add patches: + * mjpegtools-2.0.0-fix-bashisms.patch + +------------------------------------------------------------------- +Tue Apr 9 14:20:46 UTC 2013 - cfarrell@suse.com + +- license update: GPL-2.0 + ÃPresence of many GPL-2.0 licensed files in mplex/ y4mdenoise + +------------------------------------------------------------------- +Fri Mar 1 11:50:08 UTC 2013 - coolo@suse.com + +- update license to new format + +------------------------------------------------------------------- +Tue Jul 3 21:51:17 UTC 2012 - meissner@suse.com + +- disable simd-accel on ppc as it does not build with the + reduced tarball + +------------------------------------------------------------------- +Sun May 6 14:35:50 UTC 2012 - reddwarf@opensuse.org + +- Don't force a libpng version +- Modify %attr use to make it compatible with old distros + +------------------------------------------------------------------- +Thu Mar 15 19:38:49 UTC 2012 - dimstar@opensuse.org + +- Add mjpegtools-gcc47.patch: Fix build with gcc 4.7. + +------------------------------------------------------------------- +Fri Dec 2 12:57:55 UTC 2011 - coolo@suse.com + +- add libtool as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- +Tue Nov 15 02:02:52 UTC 2011 - cmorve69@yahoo.es + +- Update to 2.0.0 +- Remove obsoleted patches +- Rename to follow SLPP +- Use pkgconfig()-type BuildRequires +- Spec-clean + +------------------------------------------------------------------- +Sun Aug 7 15:49:23 UTC 2011 - chris@computersalat.de + +- fix BUILD_ORIG + o add fix_lib_versioning-mpeg2enc patch (mpeg2enc/Makefile.am) +- add gtk2-devel (Gtk+ support for glav) +- remove author from descr + +------------------------------------------------------------------- +Thu Jul 7 09:10:47 UTC 2011 - idonmez@novell.com + +- Add mjpegtools-v4l-2.6.38.patch: use the new v4l interface + +------------------------------------------------------------------- +Fri Apr 14 13:38:21 UTC 2011 - toddrme2178@gmail.com + +- added 32bit compatibility libraries +- properly escape macro in comments (fix for RPMLINT warning) + +------------------------------------------------------------------- +Wed Feb 9 18:12:41 CET 2011 - pth@suse.de + +- Optimize the handling of CFLAGS. +- Don't use -fno-strict-aliasing as the compiler doesn't report + any aliasing issues. + +------------------------------------------------------------------- +Wed Feb 9 17:20:30 CET 2011 - pth@suse.de + +- Use AC_PREREQ before AC_INIT +- Move AM_INIT_AUTOMAKE to just after AC_INIT +- Use LT_INIT to init libtool and pass disable-static as default. +- Only pass -release to libtool and not -release and -version-info, + thus fixing the library naming. +- Add and use an option to configure to disable processor specific + code tuning. +- Don't bother with patching .in files as they're regenerated by + calling autoreconf. + +------------------------------------------------------------------- +Thu Sep 2 16:13:20 CEST 2010 - pgajdos@suse.cz + +- fixed crash +- see http://bugs.gentoo.org/293919, + https://qa.mandriva.com/show_bug.cgi?id=55450 + +------------------------------------------------------------------- +Mon Mar 1 17:02:04 UTC 2010 - puzel@novell.com + +- mjpegtools-1.9.0-fix-compiler-error.patch + - fix build + +------------------------------------------------------------------- +Sat Nov 21 09:31:15 CET 2009 - meissner@suse.de + +- fuzz=0 for codec patch + +------------------------------------------------------------------- +Thu Jun 4 17:19:20 CEST 2009 - puzel@suse.cz + +- add mjpegtools-fix-invalid-conversion.patch + - fixes build with new gcc and glibc + +------------------------------------------------------------------- +Mon Jan 19 14:01:50 CET 2009 - puzel@suse.cz + +- update to 1.9.0 (bug fixes) + - delete mjpegtools-jpeg2yuv_stdin.patch (fixed upstream) + - delete mjpegtools-gcc43.patch (fixed upstream) +- set correct group for -devel package (Development/Libraries/C and C++) + +------------------------------------------------------------------- +Thu Jun 26 15:48:35 CEST 2008 - puzel@suse.cz + +- update to 1.9.0rc3 + * bugfix release +- removed mjpegtools-includes.patch (fixed in upstream) +- removed mjpegtools-motionestbug.patch (fixed in upstream) +- removed mjpegtools-strcmp.patch (fixed in upstream) + +------------------------------------------------------------------- +Tue May 13 12:21:45 CEST 2008 - puzel@suse.cz + +- added libpng-devel to BuildRequires [bnc #343848] + +------------------------------------------------------------------- +Mon Jan 7 11:07:27 CET 2008 - ssommer@suse.de + +- fix build with gcc43 + +------------------------------------------------------------------- +Sun Aug 12 12:20:55 CEST 2007 - ro@suse.de + +- fix build for BUILD_ORIG not set + +------------------------------------------------------------------- +Fri Aug 10 14:05:13 CEST 2007 - pcerny@suse.cz + +- fixed dependency problems on ppc/ppc64 [#297568] + (reenabling architecture dependent configure options) +- changed DISTRIBUTABLE to BUILD_ORIG +- patch for jpeg2yuv to detect EOF correctly (from upstream) +- patch names synchronization + +------------------------------------------------------------------- +Sun Aug 5 14:03:47 CEST 2007 - olh@suse.de + +- getopt returns int, not char + align vector buffers to 16 bytes + mark one string constant as const + build parallel + +------------------------------------------------------------------- +Fri Jul 20 13:32:54 CEST 2007 - pcerny@suse.cz + +- removed dependece on avifile and some other packages + +------------------------------------------------------------------- +Wed May 9 16:11:04 CEST 2007 - pcerny@suse.cz + +- update to 1.9.0rc2 + +------------------------------------------------------------------- +Mon Oct 16 02:10:57 CEST 2006 - ro@suse.de + +- fix build with current libquicktime + +------------------------------------------------------------------- +Tue Mar 14 13:02:53 CET 2006 - ro@suse.de + +- disable altivec also on ppc64 (not just on ppc) + +------------------------------------------------------------------- +Fri Jan 27 14:32:59 CET 2006 - nadvornik@suse.cz + +- fixed BuildRequires + +------------------------------------------------------------------- +Thu Jan 26 15:51:26 CET 2006 - sbrabec@suse.cz + +- Added %install_info_prereq. + +------------------------------------------------------------------- +Wed Jan 25 21:38:19 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Tue Nov 29 17:58:40 CET 2005 - ro@suse.de + +- overwrite cpuinfo.sh, the build-host is basically random + and optimizing for a random cpu does not help + +------------------------------------------------------------------- +Wed Oct 26 16:20:05 CEST 2005 - rguenther@suse.de + +- add missing include of assert.h to allow building with gcc 4.1 + +------------------------------------------------------------------- +Fri Oct 21 14:21:24 CEST 2005 - kraxel@suse.de + +- updated to 1.8.0. +- splitted away -devel package. + +------------------------------------------------------------------- +Mon Sep 26 17:12:42 CEST 2005 - sbrabec@suse.cz + +- Force gtk2 using gtk1-compat-devel. + +------------------------------------------------------------------- +Tue May 3 17:11:53 CEST 2005 - pmladek@suse.cz + +- added some more fixes to build with gcc4 + +------------------------------------------------------------------- +Tue Apr 19 02:27:18 CEST 2005 - ro@suse.de + +- fix build with gcc-4 + +------------------------------------------------------------------- +Thu Apr 22 18:53:01 CEST 2004 - kraxel@suse.de + +- add -fno-strict-aliasing. + +------------------------------------------------------------------- +Thu Feb 5 10:06:21 CET 2004 - kraxel@suse.de + +- update to 1.6.2-final. + +------------------------------------------------------------------- +Thu Jan 22 17:31:05 CET 2004 - kraxel@suse.de + +- updated to 1.6.2-rc4. +- some spec file cleanups. + +------------------------------------------------------------------- +Sat Jan 10 14:48:49 CET 2004 - adrian@suse.de + +- add %run_ldconfig + +------------------------------------------------------------------- +Tue Aug 12 00:58:07 CEST 2003 - ro@suse.de + +- fix build with latest avifile + +------------------------------------------------------------------- +Tue May 27 12:51:13 CEST 2003 - kraxel@suse.de + +- file list fixups. + +------------------------------------------------------------------- +Mon Mar 10 11:49:38 CET 2003 - kraxel@suse.de + +- ppc build fix. + +------------------------------------------------------------------- +Tue Feb 25 10:28:44 CET 2003 - aj@suse.de + +- Add missing assert includes. + +------------------------------------------------------------------- +Mon Feb 17 16:04:38 CET 2003 - ro@suse.de + +- fix last change + +------------------------------------------------------------------- +Thu Feb 13 16:04:44 CET 2003 - sf@suse.de + +- compile with -fPIC on archs != i386 + (needed for gstreamer-plugins) + +------------------------------------------------------------------- +Thu Feb 13 14:35:11 CET 2003 - ro@suse.de + +- added freetype2-devel + +------------------------------------------------------------------- +Wed Feb 12 18:09:05 CET 2003 - ro@suse.de + +- added expat to neededforbuild + +------------------------------------------------------------------- +Tue Dec 10 16:50:54 CET 2002 - kraxel@suse.de + +- updated to version 1.6.1 +- splitted libmovtar into a new package + +------------------------------------------------------------------- +Fri Jul 5 10:43:03 CEST 2002 - kukuk@suse.de + +- Use %ix86 macro + +------------------------------------------------------------------- +Thu Jul 4 12:26:24 CEST 2002 - ro@suse.de + +- neededforbuild quicktime4linux -> libquicktime + +------------------------------------------------------------------- +Tue Jun 25 14:11:51 CEST 2002 - uli@suse.de + +- build movtar with -fPIC + +------------------------------------------------------------------- +Wed Jun 12 12:15:56 CEST 2002 - uli@suse.de + +- update -> 1.6.0 (final) + +------------------------------------------------------------------- +Fri May 24 16:18:48 CEST 2002 - meissner@suse.de + +- %_lib fixes. + +------------------------------------------------------------------- +Fri Apr 26 18:33:21 CEST 2002 - uli@suse.de + +- update -> 1.6.0-rc2 +- update jpeg-mmx -> 0.1.4-rc1 +- update libmovtar -> 0.1.3-rc1 +- ditched buildroot crap, it breaks movtar +- disabled cmov optimizations (no runtime detection) +- changed MPEGTOOLS switch to DISTRIBUTABLE (with inverse logic) + to ensure consistency with other packages + +------------------------------------------------------------------- +Wed Apr 3 15:19:07 CEST 2002 - sf@suse.de + +- update to 1.6.0-beta2 +- gcc3 fix +- spec cleanup +- removed mjpegtools.dif +- added DV-support again, as mmx-detection in libdv is "fixed" +- added buildroot + +------------------------------------------------------------------- +Fri Feb 8 17:57:19 CET 2002 - uli@suse.de + +- build without DV support (causes reliable segfaults even on + non-DV input) + +------------------------------------------------------------------- +Fri Feb 1 00:26:11 CET 2002 - ro@suse.de + +- changed neededforbuild to + +------------------------------------------------------------------- +Fri Jan 25 11:37:58 CET 2002 - uli@suse.de + +- update -> 1.6.0-beta1 + +------------------------------------------------------------------- +Wed Aug 8 16:55:46 CEST 2001 - ro@suse.de + +- changed neededforbuild to +- changed neededforbuild to + +------------------------------------------------------------------- +Tue Jul 10 15:48:38 CEST 2001 - uli@suse.de + +- initial package + diff --git a/mjpegtools.spec b/mjpegtools.spec new file mode 100644 index 0000000..8bcd76d --- /dev/null +++ b/mjpegtools.spec @@ -0,0 +1,235 @@ +# +# spec file for package mjpegtools +# +# Copyright (c) 2022 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%define lib_version %(echo %{version} | cut -d. -f1-2) + +Name: mjpegtools +Version: 2.2.1 +Release: 0 +Summary: MJPEG Video Capture and Processing Tools +License: GPL-2.0-only +Group: Productivity/Multimedia/Video/Editors and Convertors +URL: http://mjpeg.sourceforge.net/ +Source: https://sourceforge.net/projects/mjpeg/files/%{name}/%{version}/%{name}-%{version}.tar.gz/download#/%{name}-%{version}.tar.bz2 +Source99: baselibs.conf + +Patch1: mjpegtools-vector_alignment.patch +Patch2: mjpegtools-getopt.patch +Patch3: mjpegtools-writeable_strings.patch +Patch6: mjpegtools-v4l-2.6.38.patch +Patch8: mjpegtools-2.0.0-fix-bashisms.patch +BuildRequires: gcc-c++ +BuildRequires: libjpeg-devel +BuildRequires: libtool +BuildRequires: pkgconfig +BuildRequires: pkgconfig(SDL_gfx) +BuildRequires: pkgconfig(libdv) +BuildRequires: pkgconfig(libpng) >= 1.4 +BuildRequires: pkgconfig(libquicktime) +BuildRequires: pkgconfig(libv4l1) +BuildRequires: pkgconfig(sdl) +BuildRequires: pkgconfig(x11) +Requires(post): info +Requires(preun):info +Obsoletes: mjpegtools-orig-addon + +%description +The mjpegtools allow for capture, playback, processing, and simple +editing of MJPEG AV data. The hardware I/O applications are intended +for use with Zoran MJPEG framegrabber-based hardware (see the +zoran-driver package), but the processing tools can be used with MJPEG +data from other sources as well. + +%package -n libmjpegutils-2_2-0 +Summary: MJPEG Video Capture and Processing Tools +Group: System/Libraries + +%description -n libmjpegutils-2_2-0 +The mjpegtools allow for capture, playback, processing, and simple +editing of MJPEG AV data. The hardware I/O applications are intended +for use with Zoran MJPEG framegrabber-based hardware (see the +zoran-driver package), but the processing tools can be used with MJPEG +data from other sources as well. + +%package -n liblavfile-2_2-0 +Summary: MJPEG Video Capture and Processing Tools +Group: System/Libraries + +%description -n liblavfile-2_2-0 +The mjpegtools allow for capture, playback, processing, and simple +editing of MJPEG AV data. The hardware I/O applications are intended +for use with Zoran MJPEG framegrabber-based hardware (see the +zoran-driver package), but the processing tools can be used with MJPEG +data from other sources as well. + +%package -n liblavjpeg-2_2-0 +Summary: MJPEG Video Capture and Processing Tools +Group: System/Libraries + +%description -n liblavjpeg-2_2-0 +The mjpegtools allow for capture, playback, processing, and simple +editing of MJPEG AV data. The hardware I/O applications are intended +for use with Zoran MJPEG framegrabber-based hardware (see the +zoran-driver package), but the processing tools can be used with MJPEG +data from other sources as well. + +%package -n liblavplay-2_2-0 +Summary: MJPEG Video Capture and Processing Tools +Group: System/Libraries + +%description -n liblavplay-2_2-0 +The mjpegtools allow for capture, playback, processing, and simple +editing of MJPEG AV data. The hardware I/O applications are intended +for use with Zoran MJPEG framegrabber-based hardware (see the +zoran-driver package), but the processing tools can be used with MJPEG +data from other sources as well. + +%package -n liblavrec-2_2-0 +Summary: MJPEG Video Capture and Processing Tools +Group: System/Libraries + +%description -n liblavrec-2_2-0 +The mjpegtools allow for capture, playback, processing, and simple +editing of MJPEG AV data. The hardware I/O applications are intended +for use with Zoran MJPEG framegrabber-based hardware (see the +zoran-driver package), but the processing tools can be used with MJPEG +data from other sources as well. + +%package -n libmplex2-2_2-0 +Summary: MJPEG Video Capture and Processing Tools +Group: System/Libraries + +%description -n libmplex2-2_2-0 +The mjpegtools allow for capture, playback, processing, and simple +editing of MJPEG AV data. The hardware I/O applications are intended +for use with Zoran MJPEG framegrabber-based hardware (see the +zoran-driver package), but the processing tools can be used with MJPEG +data from other sources as well. + +%package -n libmpeg2encpp-2_2-0 +Summary: MJPEG Video Capture and Processing Tools +Group: System/Libraries + +%description -n libmpeg2encpp-2_2-0 +The mjpegtools allow for capture, playback, processing, and simple +editing of MJPEG AV data. The hardware I/O applications are intended +for use with Zoran MJPEG framegrabber-based hardware (see the +zoran-driver package), but the processing tools can be used with MJPEG +data from other sources as well. + +%package -n libmjpegutils-devel +Summary: MJPEG Video Capture and Processing Tools +Group: Development/Libraries/C and C++ +Requires: liblavfile-2_2-0 = %{version} +Requires: liblavjpeg-2_2-0 = %{version} +Requires: liblavplay-2_2-0 = %{version} +Requires: liblavrec-2_2-0 = %{version} +Requires: libmjpegutils-2_2-0 = %{version} +Requires: libmpeg2encpp-2_2-0 = %{version} +Requires: libmplex2-2_2-0 = %{version} +Provides: mjpegtools-devel = %{version} +Obsoletes: mjpegtools-devel < %{version} + +%description -n libmjpegutils-devel +This package contains all files needed to develop code that uses the +mjpegtools libraries. + +%prep +%autosetup -p1 + +%build +sed -i~ '/currently broken/d' mpeg2enc/mpeg2enc.cc +diff -u mpeg2enc/mpeg2enc.cc* || : +autoreconf -vfi +EXTRAOPTS="" +%ifarch ppc ppc64 +EXTRAOPTS="--disable-simd-accel" +%endif +export CFLAGS="%{optflags} $(pkg-config --cflags SDL_gfx)" +%configure \ + --disable-static \ + --without-gtk \ + $EXTRAOPTS \ + %{nil} +%make_build + +%install +%make_install +find %{buildroot} -type f -name "*.la" -delete -print + +%post +%install_info --info-dir=%{_infodir} %{_infodir}/mjpeg-howto.info%{ext_info} + +%preun +%install_info_delete --info-dir=%{_infodir} %{_infodir}/mjpeg-howto.info%{ext_info} + +%post -n libmjpegutils-2_2-0 -p /sbin/ldconfig +%postun -n libmjpegutils-2_2-0 -p /sbin/ldconfig +%post -n liblavfile-2_2-0 -p /sbin/ldconfig +%postun -n liblavfile-2_2-0 -p /sbin/ldconfig +%post -n liblavjpeg-2_2-0 -p /sbin/ldconfig +%postun -n liblavjpeg-2_2-0 -p /sbin/ldconfig +%post -n liblavplay-2_2-0 -p /sbin/ldconfig +%postun -n liblavplay-2_2-0 -p /sbin/ldconfig +%post -n liblavrec-2_2-0 -p /sbin/ldconfig +%postun -n liblavrec-2_2-0 -p /sbin/ldconfig +%post -n libmplex2-2_2-0 -p /sbin/ldconfig +%postun -n libmplex2-2_2-0 -p /sbin/ldconfig +%post -n libmpeg2encpp-2_2-0 -p /sbin/ldconfig +%postun -n libmpeg2encpp-2_2-0 -p /sbin/ldconfig + +%files +%attr(0755,root,root) %{_bindir}/* +%doc AUTHORS BUGS CHANGES HINTS NEWS PLANS README* TODO +%{_mandir}/man?/*.?%{ext_man} +%{_infodir}/mjpeg-howto.info%{?ext_info} + +%files -n libmjpegutils-2_2-0 +%license COPYING +%{_libdir}/libmjpegutils-%{lib_version}.so.* + +%files -n liblavfile-2_2-0 +%{_libdir}/liblavfile-%{lib_version}.so.* + +%files -n liblavjpeg-2_2-0 +%{_libdir}/liblavjpeg-%{lib_version}.so.* + +%files -n liblavplay-2_2-0 +%{_libdir}/liblavplay-%{lib_version}.so.* + +%files -n liblavrec-2_2-0 +%{_libdir}/liblavrec-%{lib_version}.so.* + +%files -n libmplex2-2_2-0 +%{_libdir}/libmplex2-%{lib_version}.so.* + +%files -n libmpeg2encpp-2_2-0 +%{_libdir}/libmpeg2encpp-%{lib_version}.so.* + +%files -n libmjpegutils-devel +%{_includedir}/mjpegtools/ +%{_libdir}/liblavfile.so +%{_libdir}/liblavjpeg.so +%{_libdir}/liblavplay.so +%{_libdir}/liblavrec.so +%{_libdir}/libmjpegutils.so +%{_libdir}/libmpeg2encpp.so +%{_libdir}/libmplex2.so +%{_libdir}/pkgconfig/mjpegtools.pc + +%changelog