From 8a60ccc0bb618fc402bc140a5cee6cf89addec51 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 12 Aug 2023 18:08:24 +0100 Subject: gentoo auto-resync : 12:08:2023 - 18:08:23 --- media-video/Manifest.gz | Bin 25335 -> 25338 bytes media-video/mjpegtools/Manifest | 4 +- .../mjpegtools-2.2.1-c++17-no-auto_ptr-fix.patch | 20 ++++ .../mjpegtools-2.2.1-c++17-register-fix.patch | 17 ++++ media-video/mjpegtools/mjpegtools-2.2.1-r1.ebuild | 112 +++++++++++++++++++++ media-video/mjpegtools/mjpegtools-2.2.1.ebuild | 109 -------------------- 6 files changed, 152 insertions(+), 110 deletions(-) create mode 100644 media-video/mjpegtools/files/mjpegtools-2.2.1-c++17-no-auto_ptr-fix.patch create mode 100644 media-video/mjpegtools/files/mjpegtools-2.2.1-c++17-register-fix.patch create mode 100644 media-video/mjpegtools/mjpegtools-2.2.1-r1.ebuild delete mode 100644 media-video/mjpegtools/mjpegtools-2.2.1.ebuild (limited to 'media-video') diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz index 5f71b49445b0..5673780c0c7d 100644 Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest index 6856e535f9ea..caab7ad1569b 100644 --- a/media-video/mjpegtools/Manifest +++ b/media-video/mjpegtools/Manifest @@ -1,3 +1,5 @@ +AUX mjpegtools-2.2.1-c++17-no-auto_ptr-fix.patch 521 BLAKE2B 6afa67ce2c4ce924e90a71261216fc3bf225692b9ef3c4c6daceabedfb655069d9916245153d718b3096f28e0c95adee7c1ce3403d92c1842c144b2eeba2389e SHA512 114dc0b9a61af40ea0866320554e7aa048610a0698f79b419b36722f5130f521d18a5abe55d6a8b8ce74623510f7ff63b49fff8bded0f60b9ad31d6ff2d45458 +AUX mjpegtools-2.2.1-c++17-register-fix.patch 391 BLAKE2B ec51922fadc66a1500ac3352de0b507d3a2210c36562ba8b72e41a90cf5fc007d3cf5579e8b6813506371989e827833b1b71da0b0444dc8a3481e03884d501e8 SHA512 bc3a6c708af357f67f5d5cd2eb11c931c44d14e698f1d2a30e066c66a7e06cbcc5238b7b7bce775127f56d3c978b44f2986801359eef9836a23ec0ffd25bceca DIST mjpegtools-2.2.1.tar.gz 2326425 BLAKE2B a6f2698dda6b7c92a1a786f39bfb1989587b2c35a1f94e435247f04a01f405808d464470fddf1eddaee73df75daaef460bd62e901b89b2b2e0b095332492b20b SHA512 4d7f4dcf56a0e6079025bf0221ee632d91c4cc635a8c7eb9ddf3f7b86ad7250415c6dc4fd4113081920bc9c8fdc2552b8a3aaf896bf5a778acfacb15c7ded830 -EBUILD mjpegtools-2.2.1.ebuild 2615 BLAKE2B c8c587b3d2ccb179fff279e2abc212682ec75f3a0a73a1f797c3432b9ecbaf0b3e701a767ded43f0a77a214921bca122676691e8220eabd7b62e6f2e5b4deb9f SHA512 2ae9505a322500f3a50ad57d687e1eb323809560d746667250e68f4ec2a37bb34ae2168c195199e0a5f4bad15253fbccd244af37a2ae03690740de988e25eccc +EBUILD mjpegtools-2.2.1-r1.ebuild 2718 BLAKE2B 7d2c89d7950b43bff774a392b8f77cef5f99f34dcf32379403b0eb3e443d18e742bdcce78d4a0adcdf99198dddd0e6539382e89d69a7db4fe5e67ec312ef0f58 SHA512 80c1a04541912cbc8e31f999ca72652e1d8addd41eb9b114205cbf636864223f5ea9f2b0fdb152dc936ae2d6a8355f215b8298be5191f4c65d3ba60b51fb55ed MISC metadata.xml 538 BLAKE2B 420dc5b1516f83aed28539d6c9cb3964135bd67d9a8c334eb5ad72bc95156fe3795ca8098cebc46e7a263e3a84cdb8bfe1a393b7f9a9f47eeaf24527748723a9 SHA512 c53c44b7a0bdea16c3c56d11edde87edea9849ffb37b2eba21701ad5791f1348d61d7216457efa0964c1503d89e2d86c4616d1fda240129f98ab2b68ec5e6926 diff --git a/media-video/mjpegtools/files/mjpegtools-2.2.1-c++17-no-auto_ptr-fix.patch b/media-video/mjpegtools/files/mjpegtools-2.2.1-c++17-no-auto_ptr-fix.patch new file mode 100644 index 000000000000..cc68c95c2493 --- /dev/null +++ b/media-video/mjpegtools/files/mjpegtools-2.2.1-c++17-no-auto_ptr-fix.patch @@ -0,0 +1,20 @@ +--- a/mplex/main.cpp ++++ b/mplex/main.cpp +@@ -50,7 +50,7 @@ + #include "multiplexor.hpp" + + +-using std::auto_ptr; ++using std::unique_ptr; + + + /************************************************************************* +@@ -138,7 +138,7 @@ + void + FileOutputStream::NextSegment( ) + { +- auto_ptr prev_filename_buf( new char[strlen(cur_filename)+1] ); ++ unique_ptr prev_filename_buf( new char[strlen(cur_filename)+1] ); + char *prev_filename = prev_filename_buf.get(); + fclose(strm); + ++segment_num; diff --git a/media-video/mjpegtools/files/mjpegtools-2.2.1-c++17-register-fix.patch b/media-video/mjpegtools/files/mjpegtools-2.2.1-c++17-register-fix.patch new file mode 100644 index 000000000000..b32cef5129a1 --- /dev/null +++ b/media-video/mjpegtools/files/mjpegtools-2.2.1-c++17-register-fix.patch @@ -0,0 +1,17 @@ +--- a/utils/fastintfns.h ++++ b/utils/fastintfns.h +@@ -2,12 +2,12 @@ + * + * WARNING: Assumes 2's complement arithmetic. + */ +-static inline int intmax( register int x, register int y ) ++static inline int intmax( int x, int y ) + { + return x < y ? y : x; + } + +-static inline int intmin( register int x, register int y ) ++static inline int intmin( int x, int y ) + { + return x < y ? x : y; + } diff --git a/media-video/mjpegtools/mjpegtools-2.2.1-r1.ebuild b/media-video/mjpegtools/mjpegtools-2.2.1-r1.ebuild new file mode 100644 index 000000000000..a56461679280 --- /dev/null +++ b/media-video/mjpegtools/mjpegtools-2.2.1-r1.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools multilib-minimal + +DESCRIPTION="Tools for MJPEG video" +HOMEPAGE="http://mjpeg.sourceforge.net/" +SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz" + +LICENSE="GPL-2" +# Compare with version in SONAME on major bumps (e.g. 2.1 -> 2.2) +SLOT="1/2.2" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" +IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs" +REQUIRED_USE="sdlgfx? ( sdl )" + +BDEPEND=" + virtual/pkgconfig +" +RDEPEND=" + media-libs/libjpeg-turbo:0[static-libs?,${MULTILIB_USEDEP}] + dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] ) + gtk? ( x11-libs/gtk+:2 ) + png? ( media-libs/libpng:0= ) + quicktime? ( >=media-libs/libquicktime-1.2.4-r1[${MULTILIB_USEDEP}] ) + sdl? ( + >=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}] + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + sdlgfx? ( media-libs/sdl-gfx ) + ) +" +DEPEND=" + ${RDEPEND} + app-alternatives/awk + cpu_flags_x86_mmx? ( dev-lang/nasm ) +" + +src_prepare() { + default + + eapply "${FILESDIR}/${P}-c++17-register-fix.patch" + eapply "${FILESDIR}/${P}-c++17-no-auto_ptr-fix.patch" + + eautoreconf + sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure +} + +multilib_src_configure() { + local myconf=( + --enable-compile-warnings + $(use_enable cpu_flags_x86_mmx simd-accel) + $(use_enable static-libs static) + --enable-largefile + + $(use_with quicktime libquicktime) + $(use_with dv libdv) + $(use_with sdl libsdl) + --without-v4l + $(use_with sdl x) + + # used by tools only + $(multilib_native_use_with gtk) + $(multilib_native_use_with png libpng) + $(multilib_native_use_with sdlgfx) + ) + + ECONF_SOURCE=${S} \ + econf "${myconf[@]}" +} + +multilib_src_compile() { + if multilib_is_native_abi; then + default + else + # avoid building programs + emake bin_PROGRAMS= + fi +} + +multilib_src_test() { + # there are no tests at the moment, so it would just build + # all programs in non-native ABIs... + multilib_is_native_abi && default +} + +multilib_src_install() { + if multilib_is_native_abi; then + default + else + emake DESTDIR="${D}" install \ + bin_PROGRAMS= + fi +} + +multilib_src_install_all() { + einstalldocs + dodoc mjpeg_howto.txt PLANS HINTS docs/FAQ.txt + + find "${D}" -name '*.la' -delete || die +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + elog "mjpegtools installs user contributed scripts which require additional" + elog "dependencies not pulled in by the installation." + elog "These have to be installed manually." + elog "Currently known extra dpendencies are: ffmpeg, mencoder from mplayer," + elog "parts of transcode, mpeg2dec from libmpeg2, sox, toolame, vcdimager, python." + fi +} diff --git a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild deleted file mode 100644 index c87164eacd60..000000000000 --- a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic multilib-minimal toolchain-funcs - -DESCRIPTION="Tools for MJPEG video" -HOMEPAGE="http://mjpeg.sourceforge.net/" -SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz" - -LICENSE="GPL-2" -# Compare with version in SONAME on major bumps (e.g. 2.1 -> 2.2) -SLOT="1/2.2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" -IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs" -REQUIRED_USE="sdlgfx? ( sdl )" - -BDEPEND=" - virtual/pkgconfig -" -RDEPEND=" - virtual/jpeg:0=[${MULTILIB_USEDEP}] - dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] ) - gtk? ( x11-libs/gtk+:2 ) - png? ( media-libs/libpng:0= ) - quicktime? ( >=media-libs/libquicktime-1.2.4-r1[${MULTILIB_USEDEP}] ) - sdl? ( - >=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - sdlgfx? ( media-libs/sdl-gfx ) - ) -" -DEPEND=" - ${RDEPEND} - app-alternatives/awk - cpu_flags_x86_mmx? ( dev-lang/nasm ) -" - -src_prepare() { - default - - eautoreconf - sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure -} - -multilib_src_configure() { - local myconf=( - --enable-compile-warnings - $(use_enable cpu_flags_x86_mmx simd-accel) - $(use_enable static-libs static) - --enable-largefile - - $(use_with quicktime libquicktime) - $(use_with dv libdv) - $(use_with sdl libsdl) - --without-v4l - $(use_with sdl x) - - # used by tools only - $(multilib_native_use_with gtk) - $(multilib_native_use_with png libpng) - $(multilib_native_use_with sdlgfx) - ) - - ECONF_SOURCE=${S} \ - econf "${myconf[@]}" -} - -multilib_src_compile() { - if multilib_is_native_abi; then - default - else - # avoid building programs - emake bin_PROGRAMS= - fi -} - -multilib_src_test() { - # there are no tests at the moment, so it would just build - # all programs in non-native ABIs... - multilib_is_native_abi && default -} - -multilib_src_install() { - if multilib_is_native_abi; then - default - else - emake DESTDIR="${D}" install \ - bin_PROGRAMS= - fi -} - -multilib_src_install_all() { - einstalldocs - dodoc mjpeg_howto.txt PLANS HINTS docs/FAQ.txt - - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - elog "mjpegtools installs user contributed scripts which require additional" - elog "dependencies not pulled in by the installation." - elog "These have to be installed manually." - elog "Currently known extra dpendencies are: ffmpeg, mencoder from mplayer," - elog "parts of transcode, mpeg2dec from libmpeg2, sox, toolame, vcdimager, python." - fi -} -- cgit v1.2.3