[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Sam James]

commit: 821ec21893dc8c318a6d890b766cdc16d56d56a7
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 27 21:59:46 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 27 21:59:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=821ec218

media-video/mjpegtools: EAPI 8

Signed-off-by: Sam James  gentoo.org>

 media-video/mjpegtools/mjpegtools-2.2.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.2.1-r2.ebuild 
b/media-video/mjpegtools/mjpegtools-2.2.1-r2.ebuild
index 71a254556311..b6700e97964f 100644
--- a/media-video/mjpegtools/mjpegtools-2.2.1-r2.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.2.1-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools multilib-minimal
 

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/files/, media-video/mjpegtools/

[Sam James]

commit: 3f8de491a11fd52f6350c604247ebc0f630cab98
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 27 21:57:44 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 27 21:57:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f8de491

media-video/mjpegtools: various correctness fixes

* Fix build with GCC 15
* Fix LTO safety
* Fix C99 issue in configure

Closes: https://bugs.gentoo.org/899868
Closes: https://bugs.gentoo.org/927103
Closes: https://bugs.gentoo.org/936562
Signed-off-by: Sam James  gentoo.org>

 .../files/mjpegtools-2.2.1-gcc15-template.patch| 349 +
 .../mjpegtools/files/mjpegtools-2.2.1-lto.patch|  24 ++
 .../mjpegtools-2.2.1-puts-c99-configure.patch  |  13 +
 ...-2.2.1-r1.ebuild => mjpegtools-2.2.1-r2.ebuild} |   3 +
 4 files changed, 389 insertions(+)

diff --git a/media-video/mjpegtools/files/mjpegtools-2.2.1-gcc15-template.patch 
b/media-video/mjpegtools/files/mjpegtools-2.2.1-gcc15-template.patch
new file mode 100644
index ..66d017233233
--- /dev/null
+++ b/media-video/mjpegtools/files/mjpegtools-2.2.1-gcc15-template.patch
@@ -0,0 +1,349 @@
+https://bugs.gentoo.org/936562
+https://sourceforge.net/p/mjpeg/patches/63/
+--- a/y4mdenoise/Region2D.hh
 b/y4mdenoise/Region2D.hh
+@@ -97,35 +97,11 @@
+   // Add the given horizontal extent to the region.  Note that
+   // a_tnXEnd is technically one past the end of the extent.
+ 
+-  template 
+-  void UnionDebug (Status_t _reStatus, INDEX a_tnY,
+-  INDEX a_tnXStart, INDEX a_tnXEnd, REGION_TEMP _rTemp);
+-  // Add the given horizontal extent to the region.  Note that
+-  // a_tnXEnd is technically one past the end of the extent.
+-  // Exhaustively (i.e. slowly) verifies the results, using a
+-  // much simpler algorithm.
+-  // Requires the use of a temporary region, usually of the
+-  // final subclass' type, in order to work.  (Since that can't
+-  // be known at this level, a template parameter is included for
+-  // it.)
+-
+   template 
+   void Union (Status_t _reStatus, const REGION _rOther);
+   // Make the current region represent the union between itself
+   // and the other given region.
+ 
+-  template 
+-  void UnionDebug (Status_t _reStatus,
+-  REGION_O _rOther, REGION_TEMP _rTemp);
+-  // Make the current region represent the union between itself
+-  // and the other given region.
+-  // Exhaustively (i.e. slowly) verifies the results, using a
+-  // much simpler algorithm.
+-  // Requires the use of a temporary region, usually of the
+-  // final subclass' type, in order to work.  (Since that can't
+-  // be known at this level, a template parameter is included for
+-  // it.)
+-
+   //void Merge (Status_t _reStatus, INDEX a_tnY, INDEX a_tnXStart,
+   //  INDEX a_tnXEnd);
+   // Merge this extent into the current region.
+@@ -166,36 +142,11 @@
+   // Subtract the given horizontal extent from the region.  Note
+   // that a_tnXEnd is technically one past the end of the extent.
+ 
+-  template 
+-  void SubtractDebug (Status_t _reStatus, INDEX a_tnY,
+-  INDEX a_tnXStart, INDEX a_tnXEnd, REGION_TEMP _rTemp);
+-  // Subtract the given horizontal extent from the region.  Note
+-  // that a_tnXEnd is technically one past the end of the extent.
+-  // Exhaustively (i.e. slowly) verifies the results, using a
+-  // much simpler algorithm.
+-  // Requires the use of a temporary region, usually of the
+-  // final subclass' type, in order to work.  (Since that can't
+-  // be known at this level, a template parameter is included for
+-  // it.)
+-
+   template 
+   void Subtract (Status_t _reStatus, const REGION _rOther);
+   // Subtract the other region from the current region, i.e.
+   // remove from the current region any extents that exist in the
+   // other region.
+-  
+-  template 
+-  void SubtractDebug (Status_t _reStatus, REGION_O _rOther,
+-  REGION_TEMP _rTemp);
+-  // Subtract the other region from the current region, i.e.
+-  // remove from the current region any extents that exist in the
+-  // other region.
+-  // Exhaustively (i.e. slowly) verifies the results, using a
+-  // much simpler algorithm.
+-  // Requires the use of a temporary region, usually of the
+-  // final subclass' type, in order to work.  (Since that can't
+-  // be known at this level, a template parameter is 

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Daniel Pielmeier]

commit: ed978306d6004f40543345ca6cbf9e4890ad6e0b
Author: Daniel Pielmeier  gentoo  org>
AuthorDate: Fri Mar  8 14:16:46 2024 +
Commit: Daniel Pielmeier  gentoo  org>
CommitDate: Fri Mar  8 14:16:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed978306

media-video/mjpegtools: update HOMEPAGE, SRC_URI

Signed-off-by: Daniel Pielmeier  gentoo.org>

 media-video/mjpegtools/mjpegtools-2.2.1-r1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.2.1-r1.ebuild 
b/media-video/mjpegtools/mjpegtools-2.2.1-r1.ebuild
index a56461679280..621ff01925ba 100644
--- a/media-video/mjpegtools/mjpegtools-2.2.1-r1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 inherit autotools multilib-minimal
 
 DESCRIPTION="Tools for MJPEG video"
-HOMEPAGE="http://mjpeg.sourceforge.net/;
-SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
+HOMEPAGE="https://mjpeg.sourceforge.io/;
+SRC_URI="mirror://sourceforge/project/mjpeg/mjpegtools/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 # Compare with version in SONAME on major bumps (e.g. 2.1 -> 2.2)

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Daniel Pielmeier]

commit: d2b50955c1c81ce2b897c7b2118edcb80fa10cb4
Author: Daniel Pielmeier  gentoo  org>
AuthorDate: Sat Aug 12 13:33:37 2023 +
Commit: Daniel Pielmeier  gentoo  org>
CommitDate: Sat Aug 12 13:33:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2b50955

media-video/mjpegtools: Revbump due to rdepend change

Signed-off-by: Daniel Pielmeier  gentoo.org>

 .../mjpegtools/{mjpegtools-2.2.1.ebuild => mjpegtools-2.2.1-r1.ebuild}| 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild 
b/media-video/mjpegtools/mjpegtools-2.2.1-r1.ebuild
similarity index 100%
rename from media-video/mjpegtools/mjpegtools-2.2.1.ebuild
rename to media-video/mjpegtools/mjpegtools-2.2.1-r1.ebuild

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Daniel Pielmeier]

commit: e6c4d9b7f4802e318962b01d072974a31156e96e
Author: Daniel Pielmeier  gentoo  org>
AuthorDate: Sat Aug 12 13:31:37 2023 +
Commit: Daniel Pielmeier  gentoo  org>
CommitDate: Sat Aug 12 13:31:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6c4d9b7

media-video/mjpegtools: Remove unused eclasses and depend on libjpeg-turbo

Signed-off-by: Daniel Pielmeier  gentoo.org>

 media-video/mjpegtools/mjpegtools-2.2.1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild 
b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
index 3f24c272b0d4..a56461679280 100644
--- a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+inherit autotools multilib-minimal
 
 DESCRIPTION="Tools for MJPEG video"
 HOMEPAGE="http://mjpeg.sourceforge.net/;
@@ -20,7 +20,7 @@ BDEPEND="
virtual/pkgconfig
 "
 RDEPEND="
-   virtual/jpeg:0=[${MULTILIB_USEDEP}]
+   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= )

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/, media-video/mjpegtools/files/

[Daniel Pielmeier]

commit: 85deb61cae13a121ad252bf49247b3314cb28787
Author: Denis Pronin  yandex  ru>
AuthorDate: Fri Aug  4 11:23:58 2023 +
Commit: Daniel Pielmeier  gentoo  org>
CommitDate: Sat Aug 12 13:13:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85deb61c

media-video/mjpegtools: fix compiling at least with c++17 standard

add two patches those are:
- fixing usage of 'register' specifier since, since c++17 standard,
it's been removed
- fixing usage pf 'auto_ptr' since, since c++17 standard, it's been
removed

Closes: https://bugs.gentoo.org/896416
Signed-off-by: Denis Pronin  yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/32171
Signed-off-by: Daniel Pielmeier  gentoo.org>

 .../mjpegtools-2.2.1-c++17-no-auto_ptr-fix.patch | 20 
 .../files/mjpegtools-2.2.1-c++17-register-fix.patch  | 17 +
 media-video/mjpegtools/mjpegtools-2.2.1.ebuild   |  3 +++
 3 files changed, 40 insertions(+)

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 ..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 ..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.ebuild 
b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
index c87164eacd60..3f24c272b0d4 100644
--- a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
@@ -40,6 +40,9 @@ DEPEND="
 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
 }

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[David Seifert]

commit: 9a3c41bf1871e39d2b516f57c93f3fe8d88f95c8
Author: David Seifert  gentoo  org>
AuthorDate: Wed Dec  7 13:51:44 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Dec  7 13:51:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a3c41bf

media-video/mjpegtools: remove sys-apps/sed from DEPEND

Signed-off-by: David Seifert  gentoo.org>

 media-video/mjpegtools/mjpegtools-2.2.1.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild 
b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
index e6ab3d86817d..c87164eacd60 100644
--- a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
@@ -33,7 +33,6 @@ RDEPEND="
 "
 DEPEND="
${RDEPEND}
-   >=sys-apps/sed-4
app-alternatives/awk
cpu_flags_x86_mmx? ( dev-lang/nasm )
 "

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[WANG Xuerui]

commit: 8f33f95aab4d82790fa08283bed44c2abc492ba9
Author: WANG Xuerui  gentoo  org>
AuthorDate: Wed Nov  2 01:36:29 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Wed Nov  2 05:49:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f33f95a

media-video/mjpegtools: keyword 2.2.1 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 media-video/mjpegtools/mjpegtools-2.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild 
b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
index 4be0d04f001e..bf16b8d668e7 100644
--- a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
@@ -12,7 +12,7 @@ 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 ~mips ppc ppc64 ~riscv sparc 
x86"
+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 )"
 

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Sam James]

commit: e3ec52cb008494a4295d387f37715067392b57c0
Author: Sam James  gentoo  org>
AuthorDate: Tue May 17 01:36:32 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 17 05:33:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3ec52cb

media-video/mjpegtools: [QA] drop (very) stale GCC version checks

Signed-off-by: Sam James  gentoo.org>

 media-video/mjpegtools/mjpegtools-2.2.1.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild 
b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
index 91c3b73db7fd..4be0d04f001e 100644
--- a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
@@ -46,8 +46,6 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-   [[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
-
local myconf=(
--enable-compile-warnings
$(use_enable cpu_flags_x86_mmx simd-accel)

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Daniel Pielmeier]

commit: 554a01529009dc297d481505a3620d8167897a5c
Author: Daniel Pielmeier  gentoo  org>
AuthorDate: Sat Apr  9 10:37:39 2022 +
Commit: Daniel Pielmeier  gentoo  org>
CommitDate: Sat Apr  9 10:38:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=554a0152

media-video/mjpegtools: Remove old.

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Daniel Pielmeier  gentoo.org>

 media-video/mjpegtools/Manifest   |   1 -
 media-video/mjpegtools/mjpegtools-2.2.0-r1.ebuild | 112 --
 2 files changed, 113 deletions(-)

diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index b1342f697e62..06067cc179f8 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1,2 +1 @@
-DIST mjpegtools-2.2.0.tar.bz2 1542088 BLAKE2B 
61736ea0782ef098110370ab75feac2d344709a849326acc366cc1dedfabe0aaec797292f09de9d0da8a2ce94506dc2c8749212b49f99ffa8775f347eae94b46
 SHA512 
d645c0004bf20cab67d2e09cde709f05e32ab755b773c93f75ab65bf6d4ab23d80addf3f8b98e1ce59cc05efc0776b11ca0c71568acb81fab6a0f15e60bce71f
 DIST mjpegtools-2.2.1.tar.gz 2326425 BLAKE2B 
a6f2698dda6b7c92a1a786f39bfb1989587b2c35a1f94e435247f04a01f405808d464470fddf1eddaee73df75daaef460bd62e901b89b2b2e0b095332492b20b
 SHA512 
4d7f4dcf56a0e6079025bf0221ee632d91c4cc635a8c7eb9ddf3f7b86ad7250415c6dc4fd4113081920bc9c8fdc2552b8a3aaf896bf5a778acfacb15c7ded830

diff --git a/media-video/mjpegtools/mjpegtools-2.2.0-r1.ebuild 
b/media-video/mjpegtools/mjpegtools-2.2.0-r1.ebuild
deleted file mode 100644
index 0616cbf4c0af..
--- a/media-video/mjpegtools/mjpegtools-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2021 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.bz2"
-
-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 ~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}
-   >=sys-apps/sed-4
-   virtual/awk
-   cpu_flags_x86_mmx? ( dev-lang/nasm )
-"
-
-src_prepare() {
-   default
-
-   eautoreconf
-   sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
-}
-
-multilib_src_configure() {
-   [[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
-
-   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 

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Sam James]

commit: fdbefad9263d5d85800a8543706892b943adb763
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon Jan 24 16:45:57 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 24 19:18:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdbefad9

media-video/mjpegtools: stable 2.2.1 for sparc, bug #831805

Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 media-video/mjpegtools/mjpegtools-2.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild 
b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
index c4e8bfaa0e0a..91c3b73db7fd 100644
--- a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
@@ -12,7 +12,7 @@ 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 ~mips ppc ppc64 ~riscv ~sparc 
x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc 
x86"
 IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Sam James]

commit: 8611e639f7bac0cf6af7bb054cf5583fc32e9da3
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 24 03:42:17 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 24 03:42:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8611e639

media-video/mjpegtools: Stabilize 2.2.1 ppc64, #831805

Signed-off-by: Sam James  gentoo.org>

 media-video/mjpegtools/mjpegtools-2.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild 
b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
index 58de34bc51f8..c4e8bfaa0e0a 100644
--- a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
@@ -12,7 +12,7 @@ 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 ~mips ppc ~ppc64 ~riscv ~sparc 
x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc 
x86"
 IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Sam James]

commit: 6554ab2d0c17db0834ab1554b1a9c5471ba0821a
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 24 03:41:48 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 24 03:41:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6554ab2d

media-video/mjpegtools: Stabilize 2.2.1 ppc, #831805

Signed-off-by: Sam James  gentoo.org>

 media-video/mjpegtools/mjpegtools-2.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild 
b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
index 9d7c540834b6..58de34bc51f8 100644
--- a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
@@ -12,7 +12,7 @@ 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 ~mips ~ppc ~ppc64 ~riscv ~sparc 
x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc 
x86"
 IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Jakov Smolić]

commit: c8d95ad7ab34d629ac7854eb7424fa4124803cf0
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat Jan 22 12:37:57 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Jan 22 12:37:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8d95ad7

media-video/mjpegtools: Stabilize 2.2.1 amd64, #831805

Signed-off-by: Jakov Smolić  gentoo.org>

 media-video/mjpegtools/mjpegtools-2.2.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild 
b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
index 54975b16164c..283a7578e11d 100644
--- a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ 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 ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
~x86"
 IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Jakov Smolić]

commit: af832b8868e0d6b62978db145aeb2c5a928011cb
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat Jan 22 12:38:09 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Jan 22 12:38:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af832b88

media-video/mjpegtools: Stabilize 2.2.1 x86, #831805

Signed-off-by: Jakov Smolić  gentoo.org>

 media-video/mjpegtools/mjpegtools-2.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild 
b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
index 283a7578e11d..9d7c540834b6 100644
--- a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
@@ -12,7 +12,7 @@ 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 ~mips ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
x86"
 IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Daniel Pielmeier]

commit: d46951580f2e074a28f20c5354769488ea84ea3a
Author: Daniel Pielmeier  gentoo  org>
AuthorDate: Thu Sep 30 17:10:14 2021 +
Commit: Daniel Pielmeier  gentoo  org>
CommitDate: Thu Sep 30 17:10:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4695158

media-video/mjpegtools: Version bump.

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Daniel Pielmeier  gentoo.org>

 media-video/mjpegtools/Manifest|   1 +
 media-video/mjpegtools/mjpegtools-2.2.1.ebuild | 112 +
 2 files changed, 113 insertions(+)

diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index b421b549de6..b1342f697e6 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1 +1,2 @@
 DIST mjpegtools-2.2.0.tar.bz2 1542088 BLAKE2B 
61736ea0782ef098110370ab75feac2d344709a849326acc366cc1dedfabe0aaec797292f09de9d0da8a2ce94506dc2c8749212b49f99ffa8775f347eae94b46
 SHA512 
d645c0004bf20cab67d2e09cde709f05e32ab755b773c93f75ab65bf6d4ab23d80addf3f8b98e1ce59cc05efc0776b11ca0c71568acb81fab6a0f15e60bce71f
+DIST mjpegtools-2.2.1.tar.gz 2326425 BLAKE2B 
a6f2698dda6b7c92a1a786f39bfb1989587b2c35a1f94e435247f04a01f405808d464470fddf1eddaee73df75daaef460bd62e901b89b2b2e0b095332492b20b
 SHA512 
4d7f4dcf56a0e6079025bf0221ee632d91c4cc635a8c7eb9ddf3f7b86ad7250415c6dc4fd4113081920bc9c8fdc2552b8a3aaf896bf5a778acfacb15c7ded830

diff --git a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild 
b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
new file mode 100644
index 000..54975b16164
--- /dev/null
+++ b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2021 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 ~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}
+   >=sys-apps/sed-4
+   virtual/awk
+   cpu_flags_x86_mmx? ( dev-lang/nasm )
+"
+
+src_prepare() {
+   default
+
+   eautoreconf
+   sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
+}
+
+multilib_src_configure() {
+   [[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
+
+   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 

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/files/

[Conrad Kostecki]

commit: 2811fd636a5435d72ac0c5e97e7eac9bfe4c1456
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Wed Sep  1 13:45:39 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Sep  1 20:27:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2811fd63

media-video/mjpegtools: remove unused patch(es)

Closes: https://github.com/gentoo/gentoo/pull/22180
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../files/mjpegtools-2.1.0-no_format.patch | 70 --
 .../mjpegtools/files/mjpegtools-2.1.0-pic.patch| 69 -
 .../files/mjpegtools-2.1.0-sdl-cflags.patch| 11 
 3 files changed, 150 deletions(-)

diff --git a/media-video/mjpegtools/files/mjpegtools-2.1.0-no_format.patch 
b/media-video/mjpegtools/files/mjpegtools-2.1.0-no_format.patch
deleted file mode 100644
index 20ed99628fb..000
--- a/media-video/mjpegtools/files/mjpegtools-2.1.0-no_format.patch
+++ /dev/null
@@ -1,70 +0,0 @@
 ./lavtools/lav_io.c.orig   2014-07-27 17:48:21.474622974 +0100
-+++ ./lavtools/lav_io.c2014-07-27 17:48:48.838881166 +0100
-@@ -926,7 +926,7 @@ lav_file_t *lav_open_input_file(char *fi
- strcat(errmsg, ", quicktime");
- #endif
-   strcat(errmsg, ").\n");
--fprintf(stderr, errmsg);
-+fprintf(stderr, "%s", errmsg);
-   free(lav_fd);
-   internal_error = ERROR_FORMAT; /* Format not recognized */
-   return 0;
 ./lavtools/lavtrans.c.orig 2014-07-27 17:58:09.410282056 +0100
-+++ ./lavtools/lavtrans.c  2014-07-27 17:59:24.769016140 +0100
-@@ -275,7 +275,7 @@ int main(int argc, char ** argv)
-if (process_image_frame != -1)
-{
-   nv = el_get_video_frame(vbuff, process_image_frame, );
--  sprintf(imgfname,outfile);
-+  sprintf(imgfname, "%s", outfile);
-   imgfd = fopen(imgfname,"wb");
-   if (imgfd==0) system_error("opening image file","fopen");
-   res = fwrite(vbuff,nv,1,imgfd);
 ./lavtools/jpeg2yuv.c.orig 2014-07-27 18:00:55.600900476 +0100
-+++ ./lavtools/jpeg2yuv.c  2014-07-27 18:01:36.848301893 +0100
-@@ -451,7 +451,7 @@ static int generate_YUV4MPEG(parameters_
-
-if (firstjpeg) {
-p = firstjpeg;
--   sprintf(jpegname, firstjpeg);
-+   sprintf(jpegname, "%s", firstjpeg);
-firstjpeg = NULL;
-}
-else {
 ./mplex/main.cpp.orig  2014-07-27 18:11:38.282143657 +0100
-+++ ./mplex/main.cpp   2014-07-27 18:06:40.352252415 +0100
-@@ -614,7 +614,7 @@ bool CmdLineMultiplexJob::ParseWorkaroun
- if( flag_table[flag].longname != 0 )
- message += sep;
- }
--mjpeg_error( message.c_str() );
-+mjpeg_error( "%s", message.c_str() );
- return false;
- }
- 
 ./yuvfilters/yuvkineco.c.orig  2014-07-27 18:15:01.476097522 +0100
-+++ ./yuvfilters/yuvkineco.c   2014-07-27 18:15:29.540366245 +0100
-@@ -48,7 +48,7 @@ buf_debug(char *buf, FILE *fp, const cha
- } else {
- #ifdef MJPEGTOOLS
-   buf[n] = '\0';
--  mjpeg_debug(buf);
-+  mjpeg_debug("%s", buf);
- #else
-   fputs(buf, stderr);
- #endif
 ./yuvfilters/yuvfilters.h.orig 2014-07-27 18:37:02.712645244 +0100
-+++ ./yuvfilters/yuvfilters.h  2014-07-27 19:13:28.156101800 +0100
-@@ -34,9 +34,9 @@ extern "C" {
- 
- #ifdef MJPEGTOOLS
- # define perror(MSG) mjpeg_error("%s: %s", MSG, strerror(errno))
--# define WERROR(MSG) mjpeg_error(MSG)
--# define WERRORL(MSG) mjpeg_error(MSG)
--# define WWARN(MSG) mjpeg_warn(MSG)
-+# define WERROR(MSG) mjpeg_error("%s", MSG)
-+# define WERRORL(MSG) mjpeg_error("%s", MSG)
-+# define WWARN(MSG) mjpeg_warn("%s", MSG)
- #else
- # define WERROR(MSG) write(2, MSG "\n", sizeof MSG)
- # define WERRORL(MSG) do { write(2, MSG, strlen(MSG)); write(2, "\n", 1); } 
while (0)

diff --git a/media-video/mjpegtools/files/mjpegtools-2.1.0-pic.patch 
b/media-video/mjpegtools/files/mjpegtools-2.1.0-pic.patch
deleted file mode 100644
index 0fda6c73c26..000
--- a/media-video/mjpegtools/files/mjpegtools-2.1.0-pic.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Index: y4mdenoise/Makefile.am
-===
-RCS file: /cvsroot/mjpeg/mjpeg_play/y4mdenoise/Makefile.am,v
-retrieving revision 1.12
-retrieving revision 1.13
-diff -u -r1.12 -r1.13
 a/y4mdenoise/Makefile.am   1 Apr 2012 08:44:49 -   1.12
-+++ b/y4mdenoise/Makefile.am   28 Nov 2013 22:39:41 -  1.13
-@@ -4,8 +4,8 @@
- 
- EXTRA_DIST = implementation.html
- 
--AM_CFLAGS = -DNDEBUG -finline-functions @PROGRAM_NOPIC@
--AM_CXXFLAGS = -DNDEBUG -finline-functions @PROGRAM_NOPIC@
-+AM_CFLAGS = -DNDEBUG -finline-functions
-+AM_CXXFLAGS = -DNDEBUG -finline-functions
- 
- INCLUDES =  -I$(top_srcdir) 

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Daniel Pielmeier]

commit: f085330d67c726d1c49bb986094523115bd9823e
Author: Daniel Pielmeier  gentoo  org>
AuthorDate: Thu Aug 19 17:42:41 2021 +
Commit: Daniel Pielmeier  gentoo  org>
CommitDate: Thu Aug 19 17:42:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f085330d

media-video/mjpegtools: Remove old.

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Daniel Pielmeier  gentoo.org>

 media-video/mjpegtools/Manifest   |   1 -
 media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild | 121 --
 2 files changed, 122 deletions(-)

diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index 27ec35868cf..b421b549de6 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1,2 +1 @@
-DIST mjpegtools-2.1.0.tar.gz 1844336 BLAKE2B 
90ae51c81e18708132f26c1fb002128193168366542cadc15060ad52f664a5f90770b3039ada2a1777eab5fec9743fb24c65083de913ebd72b23dd55f6b25741
 SHA512 
10d3288f47d7cc4de87fa63f65e0fd4bd0a9af95db77155eecccecae7a7e60ebab83eaec44cf7a2c3d9e627f0cc086eda208abee1a7a74cbf3f85e87bb979ac5
 DIST mjpegtools-2.2.0.tar.bz2 1542088 BLAKE2B 
61736ea0782ef098110370ab75feac2d344709a849326acc366cc1dedfabe0aaec797292f09de9d0da8a2ce94506dc2c8749212b49f99ffa8775f347eae94b46
 SHA512 
d645c0004bf20cab67d2e09cde709f05e32ab755b773c93f75ab65bf6d4ab23d80addf3f8b98e1ce59cc05efc0776b11ca0c71568acb81fab6a0f15e60bce71f

diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild 
b/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
deleted file mode 100644
index 4f884d39303..000
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2020 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"
-SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 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}
-   >=sys-apps/sed-4
-   virtual/awk
-   cpu_flags_x86_mmx? ( dev-lang/nasm )
-"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-pic.patch
-   # https://sourceforge.net/p/mjpeg/bugs/139/
-   "${FILESDIR}"/${P}-sdl-cflags.patch
-   "${FILESDIR}"/mjpegtools-2.1.0-no_format.patch
-)
-
-src_prepare() {
-   default
-
-   eautoreconf
-   sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
-}
-
-multilib_src_configure() {
-   [[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
-
-   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)
-
-   # used only in V4LCONF_LIBS that is not used anywhere...
-   --without-dga
-   )
-
-   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 

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Sam James]

commit: 3356dd0bf530582ee8b4ab6bab3324588f373378
Author: Sam James  gentoo  org>
AuthorDate: Fri Aug 13 22:04:20 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Aug 13 23:28:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3356dd0b

media-video/mjpegtools: add subslot for 2.2.0

Observed as:
```
>>> package: media-video/mjpegtools-2.2.0
 *  - /usr/lib64/libmjpegutils-2.1.so.0
 *  - /usr/lib64/libmjpegutils-2.1.so.0.0.0
 *  used by /usr/bin/tcextract (media-video/transcode-1.1.7-r5)
 *  used by /usr/bin/tcprobe (media-video/transcode-1.1.7-r5)
 *  used by /usr/lib64/transcode/export_mpeg2enc.so 
(media-video/transcode-1.1.7-r5)
 *  used by 3 other files
Use emerge @preserved-rebuild to rebuild packages using these libraries
```

Signed-off-by: Sam James  gentoo.org>

 .../mjpegtools/{mjpegtools-2.2.0.ebuild => mjpegtools-2.2.0-r1.ebuild} | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.2.0.ebuild 
b/media-video/mjpegtools/mjpegtools-2.2.0-r1.ebuild
similarity index 97%
rename from media-video/mjpegtools/mjpegtools-2.2.0.ebuild
rename to media-video/mjpegtools/mjpegtools-2.2.0-r1.ebuild
index a0365f1e4e8..0616cbf4c0a 100644
--- a/media-video/mjpegtools/mjpegtools-2.2.0.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.2.0-r1.ebuild
@@ -10,7 +10,8 @@ HOMEPAGE="http://mjpeg.sourceforge.net/;
 SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-SLOT="1"
+# 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 ~mips ppc ppc64 ~riscv sparc 
x86"
 IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Agostino Sarubbo]

commit: 7f7017854568d5157613bb29384ea8b41271bcbd
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Aug 10 06:41:36 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Aug 10 06:41:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f701785

media-video/mjpegtools: amd64 stable wrt bug #807124

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-video/mjpegtools/mjpegtools-2.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.2.0.ebuild 
b/media-video/mjpegtools/mjpegtools-2.2.0.ebuild
index 89e1cf43bb4..05bed08c138 100644
--- a/media-video/mjpegtools/mjpegtools-2.2.0.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Sam James]

commit: 480c5e43f77c2da74d61c88b0ec77b3273fe33be
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug  9 01:42:18 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug  9 01:42:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=480c5e43

media-video/mjpegtools: Stabilize 2.2.0 sparc, #807124

Signed-off-by: Sam James  gentoo.org>

 media-video/mjpegtools/mjpegtools-2.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.2.0.ebuild 
b/media-video/mjpegtools/mjpegtools-2.2.0.ebuild
index 9a39c787fd4..89e1cf43bb4 100644
--- a/media-video/mjpegtools/mjpegtools-2.2.0.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Sam James]

commit: d37373183061477612f8485794750d103660f280
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug  9 01:14:13 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug  9 01:14:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3737318

media-video/mjpegtools: Stabilize 2.2.0 ppc64, #807124

Signed-off-by: Sam James  gentoo.org>

 media-video/mjpegtools/mjpegtools-2.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.2.0.ebuild 
b/media-video/mjpegtools/mjpegtools-2.2.0.ebuild
index 828a0332e7a..9a39c787fd4 100644
--- a/media-video/mjpegtools/mjpegtools-2.2.0.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Sam James]

commit: 86b74e3387517801136782678f0c907f5b9ed2bc
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug  9 01:13:57 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug  9 01:13:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86b74e33

media-video/mjpegtools: Stabilize 2.2.0 ppc, #807124

Signed-off-by: Sam James  gentoo.org>

 media-video/mjpegtools/mjpegtools-2.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.2.0.ebuild 
b/media-video/mjpegtools/mjpegtools-2.2.0.ebuild
index f95abde7239..828a0332e7a 100644
--- a/media-video/mjpegtools/mjpegtools-2.2.0.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86"
 IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Sam James]

commit: 8933945630d8e76df09d3345f411259fd25a
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug  9 00:28:16 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug  9 00:28:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89339456

media-video/mjpegtools: Stabilize 2.2.0 x86, #807124

Signed-off-by: Sam James  gentoo.org>

 media-video/mjpegtools/mjpegtools-2.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.2.0.ebuild 
b/media-video/mjpegtools/mjpegtools-2.2.0.ebuild
index 9dd316d8a9c..f95abde7239 100644
--- a/media-video/mjpegtools/mjpegtools-2.2.0.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Daniel Pielmeier]

commit: 2885902718af322e4634879cd67394e01a61c416
Author: Daniel Pielmeier  gentoo  org>
AuthorDate: Wed Mar 17 15:33:10 2021 +
Commit: Daniel Pielmeier  gentoo  org>
CommitDate: Wed Mar 17 15:33:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28859027

media-video/mjpegtools: Version bump.

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Daniel Pielmeier  gentoo.org>

 media-video/mjpegtools/Manifest|   1 +
 media-video/mjpegtools/mjpegtools-2.2.0.ebuild | 111 +
 2 files changed, 112 insertions(+)

diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index 4c58d5c4dda..27ec35868cf 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1 +1,2 @@
 DIST mjpegtools-2.1.0.tar.gz 1844336 BLAKE2B 
90ae51c81e18708132f26c1fb002128193168366542cadc15060ad52f664a5f90770b3039ada2a1777eab5fec9743fb24c65083de913ebd72b23dd55f6b25741
 SHA512 
10d3288f47d7cc4de87fa63f65e0fd4bd0a9af95db77155eecccecae7a7e60ebab83eaec44cf7a2c3d9e627f0cc086eda208abee1a7a74cbf3f85e87bb979ac5
+DIST mjpegtools-2.2.0.tar.bz2 1542088 BLAKE2B 
61736ea0782ef098110370ab75feac2d344709a849326acc366cc1dedfabe0aaec797292f09de9d0da8a2ce94506dc2c8749212b49f99ffa8775f347eae94b46
 SHA512 
d645c0004bf20cab67d2e09cde709f05e32ab755b773c93f75ab65bf6d4ab23d80addf3f8b98e1ce59cc05efc0776b11ca0c71568acb81fab6a0f15e60bce71f

diff --git a/media-video/mjpegtools/mjpegtools-2.2.0.ebuild 
b/media-video/mjpegtools/mjpegtools-2.2.0.ebuild
new file mode 100644
index 000..9dd316d8a9c
--- /dev/null
+++ b/media-video/mjpegtools/mjpegtools-2.2.0.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2021 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.bz2"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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}
+   >=sys-apps/sed-4
+   virtual/awk
+   cpu_flags_x86_mmx? ( dev-lang/nasm )
+"
+
+src_prepare() {
+   default
+
+   eautoreconf
+   sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
+}
+
+multilib_src_configure() {
+   [[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
+
+   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
+}

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Pacho Ramos]

commit: 36d0a59d620e820478d219e81e1e3bed995ca20f
Author: Pacho Ramos  gentoo  org>
AuthorDate: Fri May  3 08:40:26 2019 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Fri May  3 08:40:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36d0a59d

media-video/mjpegtools: Drop old

Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Pacho Ramos  gentoo.org>

 media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild | 116 --
 1 file changed, 116 deletions(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild 
b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
deleted file mode 100644
index 9b92deb1bff..000
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-SLOT="1"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 
~amd64-fbsd"
-IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
-REQUIRED_USE="sdlgfx? ( sdl )"
-
-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}
-   >=sys-apps/sed-4
-   virtual/awk
-   >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-   cpu_flags_x86_mmx? ( dev-lang/nasm )
-"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-pic.patch
-   # https://sourceforge.net/p/mjpeg/bugs/139/
-   "${FILESDIR}"/${P}-sdl-cflags.patch
-   "${FILESDIR}"/mjpegtools-2.1.0-no_format.patch
-)
-
-src_prepare() {
-   default
-
-   eautoreconf
-   sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
-}
-
-multilib_src_configure() {
-   [[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
-
-   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)
-
-   # used only in V4LCONF_LIBS that is not used anywhere...
-   --without-dga
-   )
-
-   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
-}

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Mikle Kolyada]

commit: 269b186a25581a3d05ed827afba9c40042b7997c
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu May  2 21:22:55 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu May  2 21:22:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=269b186a

media-video/mjpegtools: alpha stable wrt bug #681492

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="alpha"

 media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild 
b/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
index 0b1c14cf658..9d93eeb9c64 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 
~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 
~amd64-fbsd"
 IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Thomas Deutschmann]

commit: 7cd4b29225a7008967baf81a6731bfe8704ca939
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Apr  1 19:48:35 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Apr  1 19:57:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cd4b292

media-video/mjpegtools: x86 stable (bug #681492)

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild 
b/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
index 71891b05e43..0b1c14cf658 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc ~x86 
~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 
~amd64-fbsd"
 IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Sergei Trofimovich]

commit: 982810fa52b5720a5424667b18f95fc6288782a1
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Mar 24 20:16:55 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Mar 24 20:16:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=982810fa

media-video/mjpegtools: stable 2.1.0-r4 for ppc64, bug #681492

Package-Manager: Portage-2.3.62, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild 
b/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
index 518870e1ef8..71891b05e43 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 sparc ~x86 
~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc ~x86 
~amd64-fbsd"
 IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Sergei Trofimovich]

commit: 948657af2dbbc51c5d68653af05c97019cf4aefd
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Mar 24 20:09:45 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Mar 24 20:09:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=948657af

media-video/mjpegtools: stable 2.1.0-r4 for ppc, bug #681492

Package-Manager: Portage-2.3.62, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild 
b/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
index 78df43cc941..518870e1ef8 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 
~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 sparc ~x86 
~amd64-fbsd"
 IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Sergei Trofimovich]

commit: 66144ba129464aeab39375d432067fd141d11d14
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Mar 24 19:40:31 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Mar 24 19:40:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66144ba1

media-video/mjpegtools: stable 2.1.0-r4 for ia64, bug #681492

Package-Manager: Portage-2.3.62, Repoman-2.3.12
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild 
b/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
index 6906d4b51c8..78df43cc941 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 
~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 
~amd64-fbsd"
 IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Sergei Trofimovich]

commit: cd98c3a4ba9284b5748f949b20f95097d350579f
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sun Mar 24 12:34:54 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Mar 24 13:08:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd98c3a4

media-video/mjpegtools: stable 2.1.0-r4 for sparc, bug #681492

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild 
b/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
index d30c9546392..6906d4b51c8 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 
~amd64-fbsd"
 IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Agostino Sarubbo]

commit: 4a6bf6f76dad84ecf710ec8233a520730efeacd5
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Mar 24 09:59:52 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Mar 24 09:59:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a6bf6f7

media-video/mjpegtools: amd64 stable wrt bug #681492

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild 
b/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
index 3ac82456dab..d30c9546392 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-fbsd"
 IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Daniel Pielmeier]

commit: 7d209e5ec8381639eb558fc0eb9c8d0f2b6e8532
Author: Daniel Pielmeier  gentoo  org>
AuthorDate: Sun Oct  7 15:47:52 2018 +
Commit: Daniel Pielmeier  gentoo  org>
CommitDate: Sun Oct  7 15:49:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d209e5e

media-video/mjpegtools: Revision bump to 2.1.0-r4. Switch to EAPI 7.

Signed-off-by: Daniel Pielmeier  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild | 121 ++
 1 file changed, 121 insertions(+)

diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild 
b/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
new file mode 100644
index 000..3ac82456dab
--- /dev/null
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r4.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2018 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"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-fbsd"
+IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
+REQUIRED_USE="sdlgfx? ( sdl )"
+
+BDEPEND="
+   >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+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}
+   >=sys-apps/sed-4
+   virtual/awk
+   cpu_flags_x86_mmx? ( dev-lang/nasm )
+"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-pic.patch
+   # https://sourceforge.net/p/mjpeg/bugs/139/
+   "${FILESDIR}"/${P}-sdl-cflags.patch
+   "${FILESDIR}"/mjpegtools-2.1.0-no_format.patch
+)
+
+src_prepare() {
+   default
+
+   eautoreconf
+   sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
+}
+
+multilib_src_configure() {
+   [[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
+
+   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)
+
+   # used only in V4LCONF_LIBS that is not used anywhere...
+   --without-dga
+   )
+
+   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
+}

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Daniel Pielmeier]

commit: 973a083e7a3fe432591020ff931159fdddbe6edc
Author: Daniel Pielmeier  gentoo  org>
AuthorDate: Thu Aug  2 18:13:57 2018 +
Commit: Daniel Pielmeier  gentoo  org>
CommitDate: Thu Aug  2 18:13:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=973a083e

media-video/mjpegtools: Remove old.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild | 110 --
 1 file changed, 110 deletions(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild 
b/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild
deleted file mode 100644
index 09216f8d0c9..000
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils 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"
-SLOT="1"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
-IUSE="dv gtk cpu_flags_x86_mmx png quicktime sdl sdlgfx static-libs"
-REQUIRED_USE="sdlgfx? ( sdl )"
-
-RDEPEND="virtual/jpeg:0=[${MULTILIB_USEDEP}]
-   quicktime? ( >=media-libs/libquicktime-1.2.4-r1[${MULTILIB_USEDEP}] )
-   dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] )
-   png? ( media-libs/libpng:0= )
-   gtk? ( x11-libs/gtk+:2 )
-   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}
-   cpu_flags_x86_mmx? ( dev-lang/nasm )
-   >=sys-apps/sed-4
-   virtual/awk
-   >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-src_prepare() {
-   epatch "${FILESDIR}"/${P}-pic.patch
-   # https://sourceforge.net/p/mjpeg/bugs/139/
-   epatch "${FILESDIR}"/${P}-sdl-cflags.patch
-   epatch "${FILESDIR}"/mjpegtools-2.1.0-no_format.patch
-   eautoreconf
-   sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
-}
-
-multilib_src_configure() {
-   [[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
-
-   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)
-
-   # used only in V4LCONF_LIBS that is not used anywhere...
-   --without-dga
-   )
-
-   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
-
-   prune_libtool_files --all
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Sergei Trofimovich]

commit: 4b864c386a987b3a23a8b40a3362a7a3d71ec197
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Jul 30 21:48:32 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Jul 30 21:48:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b864c38

media-video/mjpegtools: stable 2.1.0-r3 for ppc, bug #656180

Tested-by: ernsteiswuerfel
Package-Manager: Portage-2.3.44, Repoman-2.3.10
RepoMan-Options: --include-arches="ppc"

 media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild 
b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
index 4f1dfbf19fa..9b92deb1bff 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 sparc x86 
~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 
~amd64-fbsd"
 IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Tobias Klausmann]

commit: af4172a7fab54159321158367f6bcd1225b833ee
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Tue Jun 19 14:31:41 2018 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Tue Jun 19 14:31:52 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af4172a7

media-video/mjpegtools-2.1.0-r3: alpha stable

Gentoo-Bug: http://bugs.gentoo.org/656180

 media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild 
b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
index 2f24a7391af..6ad5a6935b3 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 
~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 
~amd64-fbsd"
 IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Thomas Deutschmann]

commit: e8f63fae8b55586bf59dfd8fa080dcfed5f1f9fe
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri May 25 22:38:10 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri May 25 23:57:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8f63fae

media-video/mjpegtools: x86 stable (bug #656180)

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild 
b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
index 54dba2b2613..2f24a7391af 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 
~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 
~amd64-fbsd"
 IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Agostino Sarubbo]

commit: f057fdc187b65e01837450374da80b984148b675
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu May 24 14:28:24 2018 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu May 24 14:28:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f057fdc1

media-video/mjpegtools: amd64 stable wrt bug #656180

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="amd64"

 media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild 
b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
index 4d7908f254b..54dba2b2613 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 
~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 
~amd64-fbsd"
 IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Sergei Trofimovich]

commit: 2644f8473b961c0cab555f646d66e24cc198fa04
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed May 23 07:27:57 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed May 23 07:28:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2644f847

media-video/mjpegtools: stable 2.1.0-r3 for ia64, bug #656180

Bug: https://bugs.gentoo.org/656180
Package-Manager: Portage-2.3.38, Repoman-2.3.9
RepoMan-Options: --include-arches="ia64"

 media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild 
b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
index a12c9c11b24..4d7908f254b 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 
~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 
~amd64-fbsd"
 IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Sergei Trofimovich]

commit: 44f72f32d05eafa25558a974a74fab6ea0b88246
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon May 21 07:08:14 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon May 21 07:30:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44f72f32

media-video/mjpegtools: stable 2.1.0-r3 for sparc

Bug: https://bugs.gentoo.org/656180
Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="sparc"

 media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild 
b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
index 85c83fad148..a12c9c11b24 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 
~amd64-fbsd"
 IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Andreas Sturmlechner]

commit: 8558d01378dbe3f04388aa5e27844c12d704a912
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May 20 15:53:53 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May 20 19:09:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8558d013

media-video/mjpegtools: Drop to ~hppa

Package-Manager: Portage-2.3.38, Repoman-2.3.9

 media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild 
b/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild
index 99e778a7bba..09216f8d0c9 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE="dv gtk cpu_flags_x86_mmx png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Andreas Sturmlechner]

commit: b5853e5d93edac69b24657bb99955c979e73cf97
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May 20 15:59:11 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May 20 19:09:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5853e5d

media-video/mjpegtools: Sort DEPENDs and IUSE

Package-Manager: Portage-2.3.38, Repoman-2.3.9

 media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild | 17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild 
b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
index 7d41dcbe218..da515e8abcc 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,24 +12,25 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-fbsd"
-IUSE="dv gtk cpu_flags_x86_mmx png quicktime sdl sdlgfx static-libs"
+IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 
-RDEPEND="virtual/jpeg:0=[${MULTILIB_USEDEP}]
-   quicktime? ( >=media-libs/libquicktime-1.2.4-r1[${MULTILIB_USEDEP}] )
+RDEPEND="
+   virtual/jpeg:0=[${MULTILIB_USEDEP}]
dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] )
-   png? ( media-libs/libpng:0= )
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}
-   cpu_flags_x86_mmx? ( dev-lang/nasm )
>=sys-apps/sed-4
virtual/awk
-   >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+   >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+   cpu_flags_x86_mmx? ( dev-lang/nasm )
+"
 
 src_prepare() {
epatch "${FILESDIR}"/${P}-pic.patch

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Andreas Sturmlechner]

commit: 3a7655ba07e908884c03d665db0d5dd032a20c74
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May 20 16:09:16 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May 20 19:09:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a7655ba

media-video/mjpegtools: Drop unused eutils.eclass

Package-Manager: Portage-2.3.38, Repoman-2.3.9

 media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild 
b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
index 65febbe011d..85c83fad148 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools eutils flag-o-matic multilib-minimal toolchain-funcs
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
 
 DESCRIPTION="Tools for MJPEG video"
 HOMEPAGE="http://mjpeg.sourceforge.net/;

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/, media-video/mjpegtools/files/

[Andreas Sturmlechner]

commit: 136acdac85f3d12e0c4bdd3dc28bd607345813cc
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May 20 16:05:07 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May 20 19:09:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=136acdac

media-video/mjpegtools: Use PATCHES, not epatch for EAPI 6

Package-Manager: Portage-2.3.38, Repoman-2.3.9

 media-video/mjpegtools/files/mjpegtools-2.1.0-pic.patch | 16 
 media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild   | 11 +++
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/media-video/mjpegtools/files/mjpegtools-2.1.0-pic.patch 
b/media-video/mjpegtools/files/mjpegtools-2.1.0-pic.patch
index 7d0d1b60c01..0fda6c73c26 100644
--- a/media-video/mjpegtools/files/mjpegtools-2.1.0-pic.patch
+++ b/media-video/mjpegtools/files/mjpegtools-2.1.0-pic.patch
@@ -4,8 +4,8 @@ RCS file: /cvsroot/mjpeg/mjpeg_play/y4mdenoise/Makefile.am,v
 retrieving revision 1.12
 retrieving revision 1.13
 diff -u -r1.12 -r1.13
 y4mdenoise/Makefile.am 1 Apr 2012 08:44:49 -   1.12
-+++ y4mdenoise/Makefile.am 28 Nov 2013 22:39:41 -  1.13
+--- a/y4mdenoise/Makefile.am   1 Apr 2012 08:44:49 -   1.12
 b/y4mdenoise/Makefile.am   28 Nov 2013 22:39:41 -  1.13
 @@ -4,8 +4,8 @@
  
  EXTRA_DIST = implementation.html
@@ -23,8 +23,8 @@ RCS file: /cvsroot/mjpeg/mjpeg_play/y4munsharp/Makefile.am,v
 retrieving revision 1.2
 retrieving revision 1.3
 diff -u -r1.2 -r1.3
 y4munsharp/Makefile.am 16 Jun 2005 17:09:38 -  1.2
-+++ y4munsharp/Makefile.am 28 Nov 2013 22:39:41 -  1.3
+--- a/y4munsharp/Makefile.am   16 Jun 2005 17:09:38 -  1.2
 b/y4munsharp/Makefile.am   28 Nov 2013 22:39:41 -  1.3
 @@ -4,7 +4,7 @@
  
  INCLUDES = -I $(top_srcdir)/utils -I $(top_srcdir)
@@ -40,8 +40,8 @@ RCS file: /cvsroot/mjpeg/mjpeg_play/y4mutils/Makefile.am,v
 retrieving revision 1.7
 retrieving revision 1.8
 diff -u -r1.7 -r1.8
 y4mutils/Makefile.am   1 Apr 2012 08:44:49 -   1.7
-+++ y4mutils/Makefile.am   28 Nov 2013 22:39:41 -  1.8
+--- a/y4mutils/Makefile.am 1 Apr 2012 08:44:49 -   1.7
 b/y4mutils/Makefile.am 28 Nov 2013 22:39:41 -  1.8
 @@ -2,7 +2,7 @@
  
  MAINTAINERCLEANFILES = Makefile.in
@@ -57,8 +57,8 @@ RCS file: /cvsroot/mjpeg/mjpeg_play/yuvscaler/Makefile.am,v
 retrieving revision 1.5
 retrieving revision 1.6
 diff -u -r1.5 -r1.6
 yuvscaler/Makefile.am  1 Apr 2012 08:44:49 -   1.5
-+++ yuvscaler/Makefile.am  28 Nov 2013 22:39:41 -  1.6
+--- a/yuvscaler/Makefile.am1 Apr 2012 08:44:49 -   1.5
 b/yuvscaler/Makefile.am28 Nov 2013 22:39:41 -  1.6
 @@ -18,6 +18,6 @@
  
  EXTRA_DIST = yuvscaler_implementation.txt

diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild 
b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
index da515e8abcc..65febbe011d 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
@@ -32,11 +32,14 @@ DEPEND="${RDEPEND}
cpu_flags_x86_mmx? ( dev-lang/nasm )
 "
 
-src_prepare() {
-   epatch "${FILESDIR}"/${P}-pic.patch
+PATCHES=(
+   "${FILESDIR}"/${P}-pic.patch
# https://sourceforge.net/p/mjpeg/bugs/139/
-   epatch "${FILESDIR}"/${P}-sdl-cflags.patch
-   epatch "${FILESDIR}"/mjpegtools-2.1.0-no_format.patch
+   "${FILESDIR}"/${P}-sdl-cflags.patch
+   "${FILESDIR}"/mjpegtools-2.1.0-no_format.patch
+)
+
+src_prepare() {
default
 
eautoreconf

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Matt Turner]

commit: 0bd91c9c4f8d53d3813613887823fdfc780cc93a
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Mar 28 22:41:34 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Mar 28 22:41:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bd91c9c

media-video/mjpegtools-2.1.0-r3: added ~mips

 media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild 
b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
index 5817ec12981..2a79372d49c 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 
~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-fbsd"
 IUSE="dv gtk cpu_flags_x86_mmx png quicktime sdl sdlgfx static-libs"
 REQUIRED_USE="sdlgfx? ( sdl )"
 

[gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/

[Daniel Pielmeier]

commit: 1f7d7db76f319812f92a17916722b9d095b3c18d
Author: Daniel Pielmeier  gentoo  org>
AuthorDate: Sun Nov 19 11:38:53 2017 +
Commit: Daniel Pielmeier  gentoo  org>
CommitDate: Sun Nov 19 11:38:53 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f7d7db7

media-video/mjpegtools: Switch to EAPI 6.

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild | 118 ++
 1 file changed, 118 insertions(+)

diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild 
b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
new file mode 100644
index 000..5817ec12981
--- /dev/null
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils 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"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 
~amd64-fbsd"
+IUSE="dv gtk cpu_flags_x86_mmx png quicktime sdl sdlgfx static-libs"
+REQUIRED_USE="sdlgfx? ( sdl )"
+
+RDEPEND="virtual/jpeg:0=[${MULTILIB_USEDEP}]
+   quicktime? ( >=media-libs/libquicktime-1.2.4-r1[${MULTILIB_USEDEP}] )
+   dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] )
+   png? ( media-libs/libpng:0= )
+   gtk? ( x11-libs/gtk+:2 )
+   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}
+   cpu_flags_x86_mmx? ( dev-lang/nasm )
+   >=sys-apps/sed-4
+   virtual/awk
+   >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+RDEPEND="${RDEPEND}
+   abi_x86_32? (
+   !<=app-emulation/emul-linux-x86-medialibs-20140508-r4
+   !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
+   )"
+
+src_prepare() {
+   epatch "${FILESDIR}"/${P}-pic.patch
+   # https://sourceforge.net/p/mjpeg/bugs/139/
+   epatch "${FILESDIR}"/${P}-sdl-cflags.patch
+   epatch "${FILESDIR}"/mjpegtools-2.1.0-no_format.patch
+   default
+
+   eautoreconf
+   sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
+}
+
+multilib_src_configure() {
+   [[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
+
+   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)
+
+   # used only in V4LCONF_LIBS that is not used anywhere...
+   --without-dga
+   )
+
+   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
+}