diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
commit | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch) | |
tree | 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /games-emulation | |
parent | b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff) |
gentoo resync : 15.12.2019
Diffstat (limited to 'games-emulation')
-rw-r--r-- | games-emulation/Manifest.gz | bin | 9853 -> 9858 bytes | |||
-rw-r--r-- | games-emulation/mekanix/Manifest | 2 | ||||
-rw-r--r-- | games-emulation/mekanix/mekanix-070-r1.ebuild | 2 | ||||
-rw-r--r-- | games-emulation/mgba/Manifest | 6 | ||||
-rw-r--r-- | games-emulation/mgba/mgba-0.8_beta1.ebuild (renamed from games-emulation/mgba/mgba-0.7.2.ebuild) | 13 | ||||
-rw-r--r-- | games-emulation/mgba/mgba-9999.ebuild | 5 | ||||
-rw-r--r-- | games-emulation/vbam/Manifest | 7 | ||||
-rw-r--r-- | games-emulation/vbam/files/vbam-2.1.4-cmake_fix.patch | 163 | ||||
-rw-r--r-- | games-emulation/vbam/vbam-2.1.4.ebuild (renamed from games-emulation/vbam/vbam-2.0.2.ebuild) | 18 | ||||
-rw-r--r-- | games-emulation/vbam/vbam-9999.ebuild | 14 |
10 files changed, 202 insertions, 28 deletions
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz Binary files differindex 485e001f4768..c9b618759489 100644 --- a/games-emulation/Manifest.gz +++ b/games-emulation/Manifest.gz diff --git a/games-emulation/mekanix/Manifest b/games-emulation/mekanix/Manifest index 8515d7d7d1f1..81a175c542e6 100644 --- a/games-emulation/mekanix/Manifest +++ b/games-emulation/mekanix/Manifest @@ -1,3 +1,3 @@ DIST mekanix070.tgz 759553 BLAKE2B ffb8a0392edd8d4887cc668e2d18b5ad955e54bf4c53cc26a06c33a3364bb7db4bd5c6ee8e5406d2885e9c173b16b0894fcc2ee3a111d03c70ad8326920011e1 SHA512 9298d74c0ff7e8d13fbe79f13f2107ea966e6f2602bb3215207a76a433d9f705cd57a33db8295d44cb975e3735a510f23a189d624ea69b83ecfc7ba6509cc3df -EBUILD mekanix-070-r1.ebuild 702 BLAKE2B 2f3b11c2b186fd5638ae9453d7fc3b3e88b583e44517f0471d3d84ddd430f7cfcff99aab1149031f2c71a09dbd8b60b302b99334711f2830b150a3317427ca0d SHA512 8f128f5446e4dbba8d0de7a9ddd11276de58731fa277109c1739411a9f4ea5872e7ed1fc5024bca0f9706cd8cff4c53fc0db7921bc423f9e7604cb239166fe7f +EBUILD mekanix-070-r1.ebuild 680 BLAKE2B 769d7ef2e1e087445527d126a7788015eff61188d72c8ebb2c5199750363db246ce0d58ba2fd53b706421f085adef8559779459137346b3368d103975f369ca4 SHA512 9941de49f7231e2e4075ce87a918e90613565f93938d5a62faa8632a10d74906bbd1573164f70d8b7dfeb365e42e4f2dbf0211900874f629e165725ad047719a MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 diff --git a/games-emulation/mekanix/mekanix-070-r1.ebuild b/games-emulation/mekanix/mekanix-070-r1.ebuild index ee7f2d85c12d..875e65fbf79c 100644 --- a/games-emulation/mekanix/mekanix-070-r1.ebuild +++ b/games-emulation/mekanix/mekanix-070-r1.ebuild @@ -27,7 +27,7 @@ src_install() { local dir="/opt/${PN}" insinto "${dir}" - doins * || die "doins failed" + doins * fperms a+x "${dir}/meka.exe" make_wrapper mekanix ./meka.exe "${dir}" } diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest index 63b7950ddc04..c3ca1384a5b3 100644 --- a/games-emulation/mgba/Manifest +++ b/games-emulation/mgba/Manifest @@ -1,9 +1,9 @@ AUX mgba-0.6.3-qt511.patch 975 BLAKE2B 3fdafdd9a10cd643fbf29a76baf4e49db50142a2f1b096f8c8b962e38166756016bf663b53dd6cf3a2e33f2f28313d477463d8807d4ecb3139bf7a0943ae0274 SHA512 41e0ea8568d8ffddac2b9020933fd4a21562049b82bfd95bb0ae372702b3312c7ee3f03e03a36fcaec723d999f7820a785a730354825cee1a737d6c2accbfb29 DIST mgba-0.6.3.tar.gz 7442154 BLAKE2B 2b46cf36174ef0a186b1bc71784820e6ddd7754a7cae695a95dcdae96efff58af70dd14faa2f1f6194a23450943d82aed2394f7bf2821ed91bf558eef6ae9c4d SHA512 d646af7869dbcf8df671a75ecfd8c270950c013b826b23b94bacae43a77243786f198725e1b9bf17827d1ffcf6a8eef70091d53ea878bfb2450472485f42f233 -DIST mgba-0.7.2.tar.gz 11255680 BLAKE2B 8d94edbc8ce6426d9f70dbab70f3e99cb18714db1646e07b5e8cde246379ea6ee761b035cdfa946e718ce869084bf957dc39309dc6b20fe400722633e4cb7f13 SHA512 e63519299358ef73939d07012cd6880478d4e5b1e6161c42bcbe36e5207af3dcbe4c147fd1a94432ddbe5fbdf5d2c9755d90984ea800bf9d9860d7f806f996cd DIST mgba-0.7.3.tar.gz 11228977 BLAKE2B 2b70bb97470558e6c10391b782f0f80e0466b2f16df07971ed378801d359157692ce56c61f4432640ed679d43dc2445a1ea45b3402c1b488fb534213d8594271 SHA512 131f850699f17a7496f7428b85b50f38b99acec4c87d5d28ba4e3af94f095a1b6d177ea731838b2971362b46c52accef9cbec98433ecfaccc080371092c7d789 +DIST mgba-0.8_beta1.tar.gz 11709751 BLAKE2B 5e09bc3de69b5c41a2cfe39fc302f3fc9d9f2d381b0ca72b24b8d3c82d21a7d900d7b6a78a1ea17a456d4cfe3be6bcfce3a46efcfbb43ee4e0e581eca68f9c71 SHA512 1a69b9826f72260fc56c3615951fda33b617898b9e459142f9d6ac3c1c07a2d668eb91e6776047665f999a013619887b55e0491a95b6708f71ab63bfbe02728a EBUILD mgba-0.6.3.ebuild 2465 BLAKE2B 257defb779b5ce3a166ea07bbcfe4b44c53093009dc135af27d2d6a80e88ff7c51edc6e4442be491ba52c9606fd6abd53037d2693b0fcf86dce808e32c830b4b SHA512 5c610cc8db0c57f8ee670c547879134ee8c4dce86c4c6c325e5af5aba2f5176b41ec470b0dc94eb568d9b0cb8d6a961e0e032172ad22d1832a5e0ac85e94953a -EBUILD mgba-0.7.2.ebuild 2394 BLAKE2B 02f43e25fb671f8262070b8378e94913aab760759dffa74b5d12927af76f290fb7cfd734adb37c96b4791343008f6f46185be9cf3cfb63dccdf15a10a7562aa2 SHA512 c1788a85deb8866da066861881a9a49f4a187ff9c50fd4139c93c4bdf747efba58fca9f88fb3da345c2e85d8dc1dc40339d3b0165cc4cb855cc8a4f48b2acc94 EBUILD mgba-0.7.3.ebuild 2505 BLAKE2B 105cf175613dbebd33e65eca800cf65d945e3aa1677af036e800c64e82b0e62c77ab581a40f23665b8731f5a57f0bd73fcc4b0c08f71df0e854ffed3155b8182 SHA512 f1a15729fb316e7482cd5254051a1e5c5057582448192c9af64b72dc572d296707be8c301d2aaec6d87a8ab4106e8727b70c7169c680d2ac30e000a1a847d2a5 -EBUILD mgba-9999.ebuild 2505 BLAKE2B 105cf175613dbebd33e65eca800cf65d945e3aa1677af036e800c64e82b0e62c77ab581a40f23665b8731f5a57f0bd73fcc4b0c08f71df0e854ffed3155b8182 SHA512 f1a15729fb316e7482cd5254051a1e5c5057582448192c9af64b72dc572d296707be8c301d2aaec6d87a8ab4106e8727b70c7169c680d2ac30e000a1a847d2a5 +EBUILD mgba-0.8_beta1.ebuild 2594 BLAKE2B d4e80bfe5c692e5667a5406536df1908b01c9a9a21d62f32e8704288eab9ed132af96c57cc8f9e87cc3f6c1e5834196db6f1e2a2b9699b132dc3e1d2583986c6 SHA512 7686f8accef676ab1208811d82c98604925ce7a2489c85c47405c126bfe2145180a564fc4eb21ae85b0c1f3365beb1d30b15b047a830fe8443c65a3106b6b5e7 +EBUILD mgba-9999.ebuild 2594 BLAKE2B d4e80bfe5c692e5667a5406536df1908b01c9a9a21d62f32e8704288eab9ed132af96c57cc8f9e87cc3f6c1e5834196db6f1e2a2b9699b132dc3e1d2583986c6 SHA512 7686f8accef676ab1208811d82c98604925ce7a2489c85c47405c126bfe2145180a564fc4eb21ae85b0c1f3365beb1d30b15b047a830fe8443c65a3106b6b5e7 MISC metadata.xml 445 BLAKE2B f8083e3c7dbf76e1f8e848e5d46c81acd0178c9ee5fd20ad01b6a0f82c203b19ff0682b3808dbaa943d38bef8b3f7c73a959d0976cdaf9b5135d1cece9f9a04e SHA512 18666c378ed81e5b4b8d0c7764fe3bcd25be4251449dc7890eb99194e17591755dc67eb12f1260a375008a75508b57ee57b187c668a8d595a20829ac315e633a diff --git a/games-emulation/mgba/mgba-0.7.2.ebuild b/games-emulation/mgba/mgba-0.8_beta1.ebuild index c5f2c50a5922..014fe2c0a7ce 100644 --- a/games-emulation/mgba/mgba-0.7.2.ebuild +++ b/games-emulation/mgba/mgba-0.8_beta1.ebuild @@ -7,11 +7,18 @@ inherit cmake-utils desktop xdg DESCRIPTION="Game Boy Advance emulator written in C" HOMEPAGE="https://mgba.io" -SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - +if [[ "${PV}" == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/mgba-emu/mgba.git" +else + MY_PV="${PV/_beta/-b}" + SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + [[ "${PV}" == *_beta* ]] || \ + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${PN}-${MY_PV}" +fi LICENSE="MPL-2.0" SLOT="0" -KEYWORDS="~amd64 ~x86" IUSE="debug elf ffmpeg imagemagick libav opengl qt5 +sdl sqlite" REQUIRED_USE="|| ( qt5 sdl ) qt5? ( opengl )" diff --git a/games-emulation/mgba/mgba-9999.ebuild b/games-emulation/mgba/mgba-9999.ebuild index 013c485228bf..014fe2c0a7ce 100644 --- a/games-emulation/mgba/mgba-9999.ebuild +++ b/games-emulation/mgba/mgba-9999.ebuild @@ -11,8 +11,11 @@ if [[ "${PV}" == 9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/mgba-emu/mgba.git" else - SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + MY_PV="${PV/_beta/-b}" + SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + [[ "${PV}" == *_beta* ]] || \ KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${PN}-${MY_PV}" fi LICENSE="MPL-2.0" SLOT="0" diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest index 4e1178ae603d..416d1c03a7a2 100644 --- a/games-emulation/vbam/Manifest +++ b/games-emulation/vbam/Manifest @@ -1,7 +1,8 @@ AUX vbam-2.1.0-performance_fixup.patch 1515 BLAKE2B fdc77976e24c1df0bb3be97f709874d768a68b238111281f2ffa0edec205bf0f7de831dd5d96e7ac77a6fa47a02781b2e248cba00d767da42c291bdc0255ffb8 SHA512 1b6cc31d6a7ef66eadc4150bf8c42edc6dbad3f08f2b508e9a62159373b218e130eeeb4afed87d2696a15d4b41775f1348f567d74d6debb3bb665b75949d2aa8 -DIST vbam-2.0.2.tar.gz 2959204 BLAKE2B 79b288e59a843d2065eac63e74984bf134d9f5dadbc687da245030ad16b138125baab0fe1fb19acac9c117e30b95e57f1880b43817f75361600fb62efd1d5272 SHA512 9aafb8ef307fbbfbc5ae6dc35bc3042934e25a30069a71949e4c8e777fd862d94ec60c189823f4acdea4cb1338098fa85a55e090fa6023c07368cbb7638dd910 +AUX vbam-2.1.4-cmake_fix.patch 5436 BLAKE2B 4af1b32f33c99cb66f7b551853fc49a402f860918214efcabb57bd1138bbe2977659fa50432f371cb443456cc0b75cbcd4f917936ae5246e1bb72a8868833cdf SHA512 3d33468003820d83b0a64fd4c086369293757a88c7883eaaf255f3fbc7aa438f08f249345a582b5eeb5269a6bf0bf0df1274aafed54931cafebda4c4c7112247 DIST vbam-2.1.0.tar.gz 2977888 BLAKE2B 48884b10d13cdeddfae1dc5a94a4576ebfd7aab263225650a7d4f7138854da3c8bbffa4a8f08e9da001cd967f0e85a7beb82f86350031264a66bfdd5403d36dd SHA512 e4489c84880a7a70e7e94104ffbbdd805e9f15d5c962c0c13a7470496d2fdad8e21c1ddb161b776eb0b1a0c7583182df5838da5a523ce31dac620aa2a7842321 -EBUILD vbam-2.0.2.ebuild 2137 BLAKE2B 765893d09675d51571ec9e701752c9151edb772e8ca576f4276de885b946ba9a28aa7dad858ef2934b2de63131a726c89644ae5ae30b1d774adf049273b11ec9 SHA512 85a98700c08db6d07109a3ca560b5f2df4db6cc2a7832fd50f82891c823e7f2c44863b09b48edeca110055d373b88ea363b7526949ce3469aedea0f4c5fed365 +DIST vbam-2.1.4.tar.gz 3891574 BLAKE2B 5255fe814ab583c433f273c31b36933c09301330b47b2deefa453453c1d127c29a1b9de2e945e6706b1f9d9ec517444989818f3db329b96c106bf5d51ec71ae3 SHA512 9070715797c6be1648661019f236eb9328eb409f52e80e15aac52d814cf4155cf1ea37c230557c1288f152f0d27d838b11bee38679787a8d5198ca81f173d896 EBUILD vbam-2.1.0.ebuild 2191 BLAKE2B 5ca4979634d3f9d04f6424b674d94ffe0dc868d831175f29ddc8943d445bd79bf378fad97ee8207ae3b65e08db17a7b1660d07e61e02eb3fab6f78ddeb535240 SHA512 a64571b4c5f9d03922a14b283ecb73bf59f03082abe12ba8427d159864fecac5b4c045ff107f5acc163473333655dd56318a9597115cece0a48a88f8e76e1bba -EBUILD vbam-9999.ebuild 2137 BLAKE2B 765893d09675d51571ec9e701752c9151edb772e8ca576f4276de885b946ba9a28aa7dad858ef2934b2de63131a726c89644ae5ae30b1d774adf049273b11ec9 SHA512 85a98700c08db6d07109a3ca560b5f2df4db6cc2a7832fd50f82891c823e7f2c44863b09b48edeca110055d373b88ea363b7526949ce3469aedea0f4c5fed365 +EBUILD vbam-2.1.4.ebuild 2081 BLAKE2B c651c54b5f912e35ebd3a624c876df635ecf71fceaa8019bc6fc65615a5cc5b143dfbbb34a35667a6a7f2a176016d0067e308f2900ff13705aef0c952ed38467 SHA512 de8eb41e2143faa8b1c08f3cebfbce29c0155cad26d2a1a36cfaed0d12ca47e4808303adb2a70db591082fdccb441aaaf8da426ebede44576da4108757867b5a +EBUILD vbam-9999.ebuild 2032 BLAKE2B 82888bd97148fc1fc2d1212dfb3ac6d9f8cd00c0482c930820f2c7c7c1bbac916af054ceef42609c999a049ed37d8a85bca9ee29593dff9730ca5e7a3c85565a SHA512 0d4735c460aab4c1a5190baf0f9f1bed16630141731270e042f0f7395b18719c93883aca89b57ef0d458417f90d7e21f4e17389e659db2f43b82022e0f903c0f MISC metadata.xml 479 BLAKE2B e5a7706e8db6c8c05cf4cf691d294c4bd54f3cc7aee5af270cce39c2d924cc81cc97a1b3d3612c1cf95d0b4b485181717d0f0daeef11a21b0c7ce0cf4d9eafda SHA512 6bd2212bd5ae35dd11f35322879f067981cac94c0c2d8f0c87e1e67170b5df245bd3616e5bb076d2892453c8b75537ee15aab49134029c0daa31d89d8aedf1d0 diff --git a/games-emulation/vbam/files/vbam-2.1.4-cmake_fix.patch b/games-emulation/vbam/files/vbam-2.1.4-cmake_fix.patch new file mode 100644 index 000000000000..d801b08317a3 --- /dev/null +++ b/games-emulation/vbam/files/vbam-2.1.4-cmake_fix.patch @@ -0,0 +1,163 @@ +From ae7349b06f86ff60b0d14dfa01b3fe2163dcfbab Mon Sep 17 00:00:00 2001 +From: Rafael Kitover <rkitover@gmail.com> +Date: Wed, 13 Nov 2019 02:56:06 +0000 +Subject: [PATCH] cmake: Use list var VBAM_LIBS for link libs. + +Accumulate link libraries for wxvbam in the VBAM_LIBS list variable +instead of listing every possible library variable in the +target_link_libraries() call. + +This fixes the issue with trying to use OPENAL_LIBRARIES when it's set +to NOTFOUND which generates a cmake error. + +Fix #563. + +Signed-off-by: Rafael Kitover <rkitover@gmail.com> +--- + src/wx/CMakeLists.txt | 43 ++++++++++++++++++++++--------------------- + 1 file changed, 22 insertions(+), 21 deletions(-) + +diff --git a/src/wx/CMakeLists.txt b/src/wx/CMakeLists.txt +index 13e0cea7..d37c1cdd 100644 +--- a/src/wx/CMakeLists.txt ++++ b/src/wx/CMakeLists.txt +@@ -15,6 +15,8 @@ endif() + + include(VbamFunctions) + ++set(VBAM_LIBS ${VBAMCORE_LIBS}) ++ + if(WIN32) + # not yet implemented + option(ENABLE_DIRECT3D "Enable Direct3D rendering for the wxWidgets port" OFF) +@@ -46,6 +48,8 @@ if(ENABLE_OPENAL) + if(OPENAL_STATIC OR (WIN32 AND ((NOT (MINGW AND MSYS)) OR CMAKE_TOOLCHAIN_FILE MATCHES mxe))) + add_definitions(-DAL_LIBTYPE_STATIC) + endif() ++ ++ list(APPEND VBAM_LIBS ${OPENAL_LIBRARY}) + else() + add_definitions(-DNO_OAL) + endif() +@@ -58,18 +62,15 @@ if(NOT ENABLE_XAUDIO2) + add_definitions(-DNO_XAUDIO2) + endif() + +-if(NOT ENABLE_FAUDIO) +- add_definitions(-DNO_FAUDIO) +-endif() +- + if(NOT ENABLE_DIRECT3D) + add_definitions(-DNO_D3D) + endif() + +-unset(FAUDIO_LIBS) + if(ENABLE_FAUDIO) + find_package(FAudio REQUIRED) +- set(FAUDIO_LIBS FAudio) ++ list(APPEND VBAM_LIBS FAudio) ++else() ++ add_definitions(-DNO_FAUDIO) + endif() + + # on unix we have to check for X11 before we overwrite all the compile/link +@@ -79,7 +80,7 @@ if(NOT WIN32 AND NOT APPLE) + + if(X11_X11_LIB AND X11_Xscreensaver_LIB) + include_directories(${X11_INCLUDE_DIR}) +- set(EXTRA_X11_LIBS ${X11_X11_LIB} ${X11_Xscreensaver_LIB}) ++ list(APPEND VBAM_LIBS ${X11_X11_LIB} ${X11_Xscreensaver_LIB}) + add_definitions(-DHAVE_XSS) + endif() + endif() +@@ -419,7 +420,7 @@ int main(int argc, char** argv) { + include_directories(${GTK4_INCLUDE_DIRS}) + link_directories(${GTK4_LIBRARY_DIRS}) + add_compile_options(${GTK4_CFLAGS_OTHER}) +- set(GTK_LIBRARIES ${GTK4_LIBRARIES}) ++ list(APPEND VBAM_LIBS ${GTK4_LIBRARIES}) + elseif(WX_USING_GTK3) + pkg_check_modules(GTK3 REQUIRED gtk+-3.0) + if(NOT GTK3_INCLUDE_DIRS) +@@ -428,7 +429,7 @@ int main(int argc, char** argv) { + include_directories(${GTK3_INCLUDE_DIRS}) + link_directories(${GTK3_LIBRARY_DIRS}) + add_compile_options(${GTK3_CFLAGS_OTHER}) +- set(GTK_LIBRARIES ${GTK3_LIBRARIES}) ++ list(APPEND VBAM_LIBS ${GTK3_LIBRARIES}) + else() + check_cxx_symbol_exists(__WXGTK20__ ${WX_CONFIG_H} WX_USING_GTK2) + if(WX_USING_GTK2) +@@ -438,7 +439,7 @@ int main(int argc, char** argv) { + include_directories(${GTK2_INCLUDE_DIRS}) + link_directories(${GTK2_LIBRARY_DIRS}) + add_compile_options(${GTK2_CFLAGS_OTHER}) +- set(GTK_LIBRARIES ${GTK2_LIBRARIES}) ++ list(APPEND VBAM_LIBS ${GTK2_LIBRARIES}) + else() + # and if that fails, use the cmake module + find_package(GTK2 REQUIRED gtk) +@@ -447,7 +448,7 @@ int main(int argc, char** argv) { + endif() + include_directories(${GTK2_INCLUDE_DIRS}) + add_compile_options(${GTK2_DEFINITIONS}) +- set(GTK_LIBRARIES ${GTK2_LIBRARIES}) ++ list(APPEND VBAM_LIBS ${GTK2_LIBRARIES}) + endif() + else() + find_package(GTK REQUIRED gtk) +@@ -456,6 +457,7 @@ int main(int argc, char** argv) { + endif() + include_directories(${GTK_INCLUDE_DIRS}) + add_compile_options(${GTK_DEFINITIONS}) ++ list(APPEND VBAM_LIBS ${GTK_LIBRARIES}) + endif() + endif() + endif() +@@ -729,14 +731,14 @@ endif() + + if(WIN32) + set(SRC_WX ${SRC_WX} wxvbam.rc dsound.cpp) +- set(DIRECTX_LIBRARIES dxguid dsound ws2_32) ++ list(APPEND VBAM_LIBS dxguid dsound ws2_32) + if(MSVC) + # workaround for some symbols needed by static SDL2.lib +- set(DIRECTX_LIBRARIES ${DIRECTX_LIBRARIES} imm32 version) ++ list(APPEND VBAM_LIBS imm32 version) + endif() + # not strictly directx, but win32-related + if(ENABLE_DEBUGGER) +- set(DIRECTX_LIBRARIES ${DIRECTX_LIBRARIES} wsock32) ++ list(APPEND VBAM_LIBS wsock32) + endif() + endif() + +@@ -783,19 +785,18 @@ endif() + + target_link_libraries( + visualboyadvance-m +- ${VBAMCORE_LIBS} + ${wxWidgets_LIBRARIES} +- ${FFMPEG_LIBRARIES} +- ${DIRECTX_LIBRARIES} +- ${GTK_LIBRARIES} +- ${OPENAL_LIBRARY} +- ${FAUDIO_LIBS} +- ${EXTRA_X11_LIBS} ++ ${VBAM_LIBS} + ) + + if(ENABLE_FFMPEG) + join("${FFMPEG_LDFLAGS}" " " FFMPEG_LDFLAGS_STR) + ++ target_link_libraries( ++ visualboyadvance-m ++ ${FFMPEG_LIBRARIES} ++ ) ++ + set_target_properties( + visualboyadvance-m + PROPERTIES LINK_FLAGS ${FFMPEG_LDFLAGS_STR} +-- +2.24.0 + diff --git a/games-emulation/vbam/vbam-2.0.2.ebuild b/games-emulation/vbam/vbam-2.1.4.ebuild index 507362bca85e..a8a2590c1f1e 100644 --- a/games-emulation/vbam/vbam-2.0.2.ebuild +++ b/games-emulation/vbam/vbam-2.1.4.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 WX_GTK_VER="3.0-gtk3" -inherit gnome2-utils wxwidgets xdg-utils cmake-utils +inherit wxwidgets xdg cmake-utils if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git" @@ -44,6 +44,10 @@ DEPEND="${RDEPEND} nls? ( sys-devel/gettext ) virtual/pkgconfig" +PATCHES=( + "${FILESDIR}"/${P}-cmake_fix.patch +) + src_configure() { use wxwidgets && setup-wxwidgets local mycmakeargs=( @@ -73,20 +77,18 @@ src_install() { pkg_preinst() { if use wxwidgets ; then - gnome2_icon_savelist + xdg_pkg_preinst fi } pkg_postinst() { if use wxwidgets ; then - gnome2_icon_cache_update - xdg_desktop_database_update + xdg_pkg_postinst fi } pkg_postrm() { if use wxwidgets ; then - gnome2_icon_cache_update - xdg_desktop_database_update + xdg_pkg_postrm fi } diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild index 507362bca85e..f8607c8a0a0e 100644 --- a/games-emulation/vbam/vbam-9999.ebuild +++ b/games-emulation/vbam/vbam-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 WX_GTK_VER="3.0-gtk3" -inherit gnome2-utils wxwidgets xdg-utils cmake-utils +inherit wxwidgets xdg cmake-utils if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git" @@ -73,20 +73,18 @@ src_install() { pkg_preinst() { if use wxwidgets ; then - gnome2_icon_savelist + xdg_pkg_preinst fi } pkg_postinst() { if use wxwidgets ; then - gnome2_icon_cache_update - xdg_desktop_database_update + xdg_pkg_postinst fi } pkg_postrm() { if use wxwidgets ; then - gnome2_icon_cache_update - xdg_desktop_database_update + xdg_pkg_postrm fi } |