From b24bd25253fe093f722ab576d29fdc41d04cb1ee Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 2 Aug 2019 19:14:55 +0100 Subject: gentoo resync : 02.08.2019 --- .../fs-uae/files/fs-uae-2.8.3-libmpeg2.patch | 36 ---------------- .../fs-uae/files/fs-uae-3.0.0-libmpeg2.patch | 48 ++++++++++++++++++++++ 2 files changed, 48 insertions(+), 36 deletions(-) delete mode 100644 app-emulation/fs-uae/files/fs-uae-2.8.3-libmpeg2.patch create mode 100644 app-emulation/fs-uae/files/fs-uae-3.0.0-libmpeg2.patch (limited to 'app-emulation/fs-uae/files') diff --git a/app-emulation/fs-uae/files/fs-uae-2.8.3-libmpeg2.patch b/app-emulation/fs-uae/files/fs-uae-2.8.3-libmpeg2.patch deleted file mode 100644 index 660cd2fc9036..000000000000 --- a/app-emulation/fs-uae/files/fs-uae-2.8.3-libmpeg2.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 5937f7587de5b96cbab120e99b6ae3a0cd722c53 Mon Sep 17 00:00:00 2001 -From: James Le Cuirot -Date: Fri, 19 Apr 2019 21:56:58 +0100 -Subject: [PATCH] Only run configure in libmpeg2 when using built-in version - ---- - configure.ac | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 39958ad..941391a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -200,7 +200,7 @@ AS_IF([test "x$with_glew" = xyes], [ - ]) - - AC_ARG_WITH(libmpeg2, AS_HELP_STRING( -- [--without-libmpeg2], [or --with-libmpeg=builtin to use included version])) -+ [--without-libmpeg2], [or --with-libmpeg2=builtin to use included version])) - AM_CONDITIONAL([BUILTIN_LIBMPEG2], [test x$with_libmpeg2 = xbuiltin]) - AS_IF([test "x$with_libmpeg2" != xno], [ - AS_IF([test "x$with_libmpeg2" = xbuiltin], [ -@@ -776,7 +776,9 @@ OPT_FEATURE([A_ZIP], [zip], [zip], - - AC_DEFINE([FPU_UAE], [1], [Define to 1]) - --AC_CONFIG_SUBDIRS([libmpeg2]) -+AS_IF([test "x$with_libmpeg2" = xbuiltin], [ -+ AC_CONFIG_SUBDIRS([libmpeg2]) -+]) - - # Write Makefile - --- -2.20.1 - diff --git a/app-emulation/fs-uae/files/fs-uae-3.0.0-libmpeg2.patch b/app-emulation/fs-uae/files/fs-uae-3.0.0-libmpeg2.patch new file mode 100644 index 000000000000..ad77dab4cdab --- /dev/null +++ b/app-emulation/fs-uae/files/fs-uae-3.0.0-libmpeg2.patch @@ -0,0 +1,48 @@ +From b10a8c60fb2cc4d80eb5a95591a9e79681f7830a Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Fri, 19 Apr 2019 21:56:58 +0100 +Subject: [PATCH] Only run configure in libmpeg2 when using built-in version + +--- + Makefile.am | 3 +++ + configure.ac | 4 +++- + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 66356baa..eece9f1e 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1,7 @@ + # Makefile.am for FS-UAE + + SUBDIRS = ++DIST_SUBDIRS = + + WARNINGS = + +@@ -1262,6 +1263,7 @@ endif + + if BUILTIN_LIBMPEG2 + SUBDIRS += libmpeg2 ++DIST_SUBDIRS += libmpeg2 + AM_CPPFLAGS += -I$(s)/libmpeg2/include + fs_uae_LDADD += \ + libmpeg2/libmpeg2/.libs/libmpeg2.a \ +diff --git a/configure.ac b/configure.ac +index 5dd3bfbd..4d4849fd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -801,7 +801,9 @@ OPT_FEATURE([A_ZIP], [zip], [zip], + + AC_DEFINE([FPU_UAE], [1], [Define to 1]) + +-AC_CONFIG_SUBDIRS([libmpeg2]) ++AS_IF([test "x$with_libmpeg2" = xbuiltin], [ ++ AC_CONFIG_SUBDIRS([libmpeg2]) ++]) + + # Write Makefile + +-- +2.21.0 + -- cgit v1.2.3