From 1f04d0ab3d7620029b756a8a470d9dcdaad13639 Mon Sep 17 00:00:00 2001
From: Michael Mair-Keimberger <mmk@levelnine.at>
Date: Sun, 25 Jul 2021 00:39:15 +0200
Subject: media-libs/smpeg: EAPI8 bump, ebuild improvements

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at>
Closes: https://bugs.gentoo.org/600688
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
---
 media-libs/smpeg/files/smpeg-0.4.4-PIC.patch       |  8 +--
 media-libs/smpeg/files/smpeg-0.4.4-automake.patch  |  2 -
 media-libs/smpeg/files/smpeg-0.4.4-config.patch    |  4 +-
 media-libs/smpeg/files/smpeg-0.4.4-flags.patch     |  2 -
 media-libs/smpeg/files/smpeg-0.4.4-format.patch    |  4 +-
 media-libs/smpeg/files/smpeg-0.4.4-gcc41.patch     |  9 +--
 media-libs/smpeg/files/smpeg-0.4.4-gcc6.patch      |  4 +-
 media-libs/smpeg/files/smpeg-0.4.4-malloc.patch    |  4 --
 .../smpeg/files/smpeg-0.4.4-missing-init.patch     |  4 +-
 media-libs/smpeg/files/smpeg-0.4.4-mmx.patch       |  2 -
 media-libs/smpeg/smpeg-0.4.4-r11.ebuild            | 71 ++++++++++++++++++++++
 11 files changed, 85 insertions(+), 29 deletions(-)
 create mode 100644 media-libs/smpeg/smpeg-0.4.4-r11.ebuild

(limited to 'media-libs/smpeg')

diff --git a/media-libs/smpeg/files/smpeg-0.4.4-PIC.patch b/media-libs/smpeg/files/smpeg-0.4.4-PIC.patch
index 88663011713b..b7ef6609cf28 100644
--- a/media-libs/smpeg/files/smpeg-0.4.4-PIC.patch
+++ b/media-libs/smpeg/files/smpeg-0.4.4-PIC.patch
@@ -1,7 +1,7 @@
 Fix PIC issues in mmx routines
 
---- video/mmxflags_asm.S
-+++ video/mmxflags_asm.S
+--- a/video/mmxflags_asm.S
++++ b/video/mmxflags_asm.S
 @@ -1,11 +1,6 @@
  
  #if defined(i386) && defined(USE_MMX)
@@ -34,8 +34,8 @@ Fix PIC issues in mmx routines
  
  cpu_flags.L1: 
          ret
---- video/mmxidct_asm.S
-+++ video/mmxidct_asm.S
+--- a/video/mmxidct_asm.S
++++ b/video/mmxidct_asm.S
 @@ -31,11 +31,6 @@ preSC:  .short  16384,22725,21407,19266,
  x0005000200010001:
  	.long	0x00010001,0x00050002
diff --git a/media-libs/smpeg/files/smpeg-0.4.4-automake.patch b/media-libs/smpeg/files/smpeg-0.4.4-automake.patch
index e541e1950113..3ad592e709ad 100644
--- a/media-libs/smpeg/files/smpeg-0.4.4-automake.patch
+++ b/media-libs/smpeg/files/smpeg-0.4.4-automake.patch
@@ -1,5 +1,3 @@
-Index: smpeg-0.4.4/configure.in
-===================================================================
 --- smpeg-0.4.4.orig/configure.in
 +++ smpeg-0.4.4/configure.in
 @@ -53,6 +53,8 @@ AC_LIBTOOL_WIN32_DLL
diff --git a/media-libs/smpeg/files/smpeg-0.4.4-config.patch b/media-libs/smpeg/files/smpeg-0.4.4-config.patch
index 2175276c351f..1a4726bdbfad 100644
--- a/media-libs/smpeg/files/smpeg-0.4.4-config.patch
+++ b/media-libs/smpeg/files/smpeg-0.4.4-config.patch
@@ -1,7 +1,7 @@
 Only dump -L/-rpath if libdir is non-standard
 
---- smpeg-config.in
-+++ smpeg-config.in
+--- a/smpeg-config.in
++++ b/smpeg-config.in
 @@ -45,11 +45,13 @@
        echo $includes -I@includedir@/smpeg `@SDL_CONFIG@ --cflags`
        ;;
diff --git a/media-libs/smpeg/files/smpeg-0.4.4-flags.patch b/media-libs/smpeg/files/smpeg-0.4.4-flags.patch
index d6b50f30d1bf..98099421769e 100644
--- a/media-libs/smpeg/files/smpeg-0.4.4-flags.patch
+++ b/media-libs/smpeg/files/smpeg-0.4.4-flags.patch
@@ -1,5 +1,3 @@
-Index: smpeg-0.4.4/configure.in
-===================================================================
 --- smpeg-0.4.4.orig/configure.in
 +++ smpeg-0.4.4/configure.in
 @@ -60,7 +60,7 @@ dnl The alpha architecture needs special
diff --git a/media-libs/smpeg/files/smpeg-0.4.4-format.patch b/media-libs/smpeg/files/smpeg-0.4.4-format.patch
index 8503f032286a..c82260a8967d 100644
--- a/media-libs/smpeg/files/smpeg-0.4.4-format.patch
+++ b/media-libs/smpeg/files/smpeg-0.4.4-format.patch
@@ -1,5 +1,5 @@
---- plaympeg.c.old	2014-09-04 08:55:10.646132150 +0200
-+++ plaympeg.c	2014-09-04 08:56:57.465210820 +0200
+--- a/plaympeg.c
++++ b/plaympeg.c
 @@ -262,7 +262,7 @@
        answer[i] = c;
      }
diff --git a/media-libs/smpeg/files/smpeg-0.4.4-gcc41.patch b/media-libs/smpeg/files/smpeg-0.4.4-gcc41.patch
index 4a0eeb4530ae..d06b08ce8945 100644
--- a/media-libs/smpeg/files/smpeg-0.4.4-gcc41.patch
+++ b/media-libs/smpeg/files/smpeg-0.4.4-gcc41.patch
@@ -1,10 +1,5 @@
-Index: MPEGaudio.h
-===================================================================
-RCS file: /cvs/cvsroot/smpeg/MPEGaudio.h,v
-retrieving revision 1.23
-diff -u -p -r1.23 MPEGaudio.h
---- smpeg/MPEGaudio.h	17 Jul 2001 19:52:24 -0000	1.23
-+++ smpeg/MPEGaudio.h	6 Dec 2005 06:10:43 -0000
+--- smpeg/MPEGaudio.h
++++ smpeg/MPEGaudio.h
 @@ -151,12 +151,6 @@ private:
  /* The actual MPEG audio class */
  class MPEGaudio : public MPEGerror, public MPEGaudioaction {
diff --git a/media-libs/smpeg/files/smpeg-0.4.4-gcc6.patch b/media-libs/smpeg/files/smpeg-0.4.4-gcc6.patch
index 4419bec4e2ee..f4c4a2b6d9cb 100644
--- a/media-libs/smpeg/files/smpeg-0.4.4-gcc6.patch
+++ b/media-libs/smpeg/files/smpeg-0.4.4-gcc6.patch
@@ -1,5 +1,5 @@
---- smpeg-0.4.4/audio/huffmantable.cpp.old	2016-09-21 17:28:34.497031221 -0400
-+++ smpeg-0.4.4/audio/huffmantable.cpp	2016-09-21 17:30:24.346141555 -0400
+--- smpeg-0.4.4/audio/huffmantable.cpp.old
++++ smpeg-0.4.4/audio/huffmantable.cpp
 @@ -550,11 +550,11 @@
  
  const HUFFMANCODETABLE MPEGaudio::ht[HTN]=
diff --git a/media-libs/smpeg/files/smpeg-0.4.4-malloc.patch b/media-libs/smpeg/files/smpeg-0.4.4-malloc.patch
index be54e58b4d23..c4939e36e939 100644
--- a/media-libs/smpeg/files/smpeg-0.4.4-malloc.patch
+++ b/media-libs/smpeg/files/smpeg-0.4.4-malloc.patch
@@ -1,5 +1,3 @@
-Index: smpeg-0.4.4/glmovie.c
-===================================================================
 --- smpeg-0.4.4.orig/glmovie.c
 +++ smpeg-0.4.4/glmovie.c
 @@ -6,7 +6,6 @@
@@ -10,8 +8,6 @@ Index: smpeg-0.4.4/glmovie.c
  #include <string.h>
  #include <unistd.h>
  #include "glmovie.h"
-Index: smpeg-0.4.4/glmovie-tile.c
-===================================================================
 --- smpeg-0.4.4.orig/glmovie-tile.c
 +++ smpeg-0.4.4/glmovie-tile.c
 @@ -16,7 +16,7 @@
diff --git a/media-libs/smpeg/files/smpeg-0.4.4-missing-init.patch b/media-libs/smpeg/files/smpeg-0.4.4-missing-init.patch
index 594c5546ebf7..62f260094440 100644
--- a/media-libs/smpeg/files/smpeg-0.4.4-missing-init.patch
+++ b/media-libs/smpeg/files/smpeg-0.4.4-missing-init.patch
@@ -1,5 +1,5 @@
---- MPEG_old.cpp	2007-01-07 23:24:45.000000000 +0100
-+++ MPEG.cpp	2007-01-07 23:25:11.000000000 +0100
+--- a/MPEG.cpp
++++ b/MPEG.cpp
 @@ -133,6 +133,7 @@
      video = NULL;
      system = NULL;
diff --git a/media-libs/smpeg/files/smpeg-0.4.4-mmx.patch b/media-libs/smpeg/files/smpeg-0.4.4-mmx.patch
index 71db62d055b4..fb0fdc89a476 100644
--- a/media-libs/smpeg/files/smpeg-0.4.4-mmx.patch
+++ b/media-libs/smpeg/files/smpeg-0.4.4-mmx.patch
@@ -1,5 +1,3 @@
-Index: smpeg-0.4.4/configure.in
-===================================================================
 --- smpeg-0.4.4.orig/configure.in
 +++ smpeg-0.4.4/configure.in
 @@ -148,6 +148,7 @@ if test x$enable_mmx = xyes; then
diff --git a/media-libs/smpeg/smpeg-0.4.4-r11.ebuild b/media-libs/smpeg/smpeg-0.4.4-r11.ebuild
new file mode 100644
index 000000000000..6c94b2006f77
--- /dev/null
+++ b/media-libs/smpeg/smpeg-0.4.4-r11.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic multilib-minimal
+
+DESCRIPTION="SDL MPEG Player Library"
+HOMEPAGE="https://icculus.org/smpeg/"
+SRC_URI="https://mirrors.dotsrc.org/lokigames/open-source/smpeg/${P}.tar.gz
+	mirror://gentoo/${P}-gtkm4.patch.bz2"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="X debug cpu_flags_x86_mmx opengl"
+
+RDEPEND="
+	media-libs/libsdl[${MULTILIB_USEDEP}]
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	X? (
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+	)"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-automake.patch
+	"${FILESDIR}"/${P}-config.patch
+	"${FILESDIR}"/${P}-flags.patch
+	"${FILESDIR}"/${P}-format.patch
+	"${FILESDIR}"/${P}-gcc41.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+	"${FILESDIR}"/${P}-gnu-stack.patch
+	"${FILESDIR}"/${P}-m4.patch
+	"${FILESDIR}"/${P}-malloc.patch
+	"${FILESDIR}"/${P}-missing-init.patch
+	"${FILESDIR}"/${P}-mmx.patch
+	"${FILESDIR}"/${P}-PIC.patch
+	"${WORKDIR}"/${P}-gtkm4.patch
+)
+
+src_prepare() {
+	default
+
+	rm acinclude.m4 || die
+	AT_M4DIR="m4" eautoreconf
+}
+
+multilib_src_configure() {
+	[[ ${CHOST} == *-solaris* ]] && append-libs -lnsl -lsocket
+
+	local myeconfargs=(
+		--disable-gtk-player
+		--enable-debug # disabling this only passes extra optimizations
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable debug assertions)
+		$(use_enable opengl opengl-player)
+		$(use_with X x)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
-- 
cgit v1.2.3-65-gdbad