commit: 77be02e524e9193d385eaa5bb80282ddb30780ec Author: Joe Kappus <joe <AT> wt <DOT> gd> AuthorDate: Fri Feb 10 09:46:03 2023 +0000 Commit: Joe Kappus <joe <AT> wt <DOT> gd> CommitDate: Fri Feb 10 09:50:52 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=77be02e5
net-misc/moonlight: add 4.3.1, drop 3.1.4 Fixed the CFLAGS getting overridden. Closes: https://bugs.gentoo.org/887891 Closes: https://bugs.gentoo.org/887893 Signed-off-by: Joe Kappus <joe <AT> wt.gd> net-misc/moonlight/Manifest | 2 +- .../moonlight/files/4.3.1-respect-cflags.patch | 53 ++++++++++++++++++++++ net-misc/moonlight/metadata.xml | 3 ++ ...onlight-3.1.4.ebuild => moonlight-4.3.1.ebuild} | 7 ++- 4 files changed, 62 insertions(+), 3 deletions(-) diff --git a/net-misc/moonlight/Manifest b/net-misc/moonlight/Manifest index df8201035..acf0147bd 100644 --- a/net-misc/moonlight/Manifest +++ b/net-misc/moonlight/Manifest @@ -1 +1 @@ -DIST MoonlightSrc-3.1.4.tar.gz 55034473 BLAKE2B 1e420ea2f711f010f37e98ae2807ef7b449547d162065ea00809a07174d9e70ce78c7a2dc627ea8f2c275048277f8d45e7430c52df8b8b757c13646e831bbb2e SHA512 893b73f00fb8552f6a7c7bc8dbacac10e7280f2bb31a4813321e3c62a8071b8c6e87688ff9d60bfb27556dea6873c0a87a822e25b6cc0529f016bce7f3480ebc +DIST MoonlightSrc-4.3.1.tar.gz 71454450 BLAKE2B cd6d8d95c3d53dbf73850cd30f86bdb9837806a642472454d70f6abee20ae91bc79c0671c4da0a74fb5f43086841a8318718c4f2f4e4768b395fb4b38d1dde9e SHA512 f5f7b23929aadb87716470522a315cba40d8155be6b76297eab4107e0fef71b48f9f4c9a4cc2b58bd48579db052a8ca8ecda9b49c78c3d229863a30886cf1847 diff --git a/net-misc/moonlight/files/4.3.1-respect-cflags.patch b/net-misc/moonlight/files/4.3.1-respect-cflags.patch new file mode 100644 index 000000000..caf053e66 --- /dev/null +++ b/net-misc/moonlight/files/4.3.1-respect-cflags.patch @@ -0,0 +1,53 @@ +diff --git a/globaldefs.pri b/globaldefs.pri +index a767cbf9..e40abe6b 100644 +--- a/globaldefs.pri ++++ b/globaldefs.pri +@@ -2,7 +2,7 @@ + CONFIG += debug_and_release + + # Ensure symbols are always generated +-CONFIG += force_debug_info ++# CONFIG += force_debug_info + + # Disable asserts on release builds + CONFIG(release, debug|release) { +Submodule h264bitstream/h264bitstream contains modified content +diff --git a/h264bitstream/h264bitstream/m4/ax_check_debug.m4 b/h264bitstream/h264bitstream/m4/ax_check_debug.m4 +index 1f5252e..df1f444 100644 +--- a/h264bitstream/h264bitstream/m4/ax_check_debug.m4 ++++ b/h264bitstream/h264bitstream/m4/ax_check_debug.m4 +@@ -26,7 +26,7 @@ AC_DEFUN([AX_CHECK_DEBUG], + else + AC_DEFINE([NDEBUG],[],[Release Mode]) + #-O3 anyone? Kills using -g in release mode so we'll stick with O2 for now. +- AM_CFLAGS="$AM_CFLAGS -O2 -g -Wall" ++ AM_CFLAGS="$AM_CFLAGS -Wall" + fi + AC_SUBST([AM_CFLAGS]) + ]) +Submodule moonlight-common-c/moonlight-common-c contains modified content +Submodule enet contains modified content +diff --git a/moonlight-common-c/moonlight-common-c/enet/enet_dll.cbp b/moonlight-common-c/moonlight-common-c/enet/enet_dll.cbp +index 961274c..e9e4ea9 100644 +--- a/moonlight-common-c/moonlight-common-c/enet/enet_dll.cbp ++++ b/moonlight-common-c/moonlight-common-c/enet/enet_dll.cbp +@@ -13,9 +13,6 @@ + <Option compiler="gcc" /> + <Option createDefFile="1" /> + <Option createStaticLib="1" /> +- <Compiler> +- <Add option="-g" /> +- </Compiler> + </Target> + <Target title="Release"> + <Option output="bin\Release\libenet" prefix_auto="1" extension_auto="1" /> +@@ -24,9 +21,6 @@ + <Option compiler="gcc" /> + <Option createDefFile="1" /> + <Option createStaticLib="1" /> +- <Compiler> +- <Add option="-O2" /> +- </Compiler> + <Linker> + <Add option="-s" /> + </Linker> diff --git a/net-misc/moonlight/metadata.xml b/net-misc/moonlight/metadata.xml index fa851f800..71155ad33 100644 --- a/net-misc/moonlight/metadata.xml +++ b/net-misc/moonlight/metadata.xml @@ -5,6 +5,9 @@ <email>andrewatha...@outlook.com</email> <name>Andrew Athalye</name> </maintainer> + <upstream> + <remote-id type="github">moonlight-stream/moonlight-qt</remote-id> + </upstream> <use> <flag name="vaapi"> Enable support for hardware video decoding using <pkg>media-libs/libva</pkg>. diff --git a/net-misc/moonlight/moonlight-3.1.4.ebuild b/net-misc/moonlight/moonlight-4.3.1.ebuild similarity index 89% rename from net-misc/moonlight/moonlight-3.1.4.ebuild rename to net-misc/moonlight/moonlight-4.3.1.ebuild index 00f544b19..4dc580678 100644 --- a/net-misc/moonlight/moonlight-3.1.4.ebuild +++ b/net-misc/moonlight/moonlight-4.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,7 +15,7 @@ KEYWORDS="~amd64" IUSE="vaapi" RDEPEND=" - >=dev-libs/openssl-1.1.1l:0/1.1 + >=dev-libs/openssl-1.1.1 >=media-libs/libsdl2-2.0.16-r1:0[kms] >=media-libs/sdl2-ttf-2.0.15:0 >=media-video/ffmpeg-4.4-r1:0 @@ -32,6 +32,9 @@ BDEPEND=" virtual/pkgconfig dev-qt/qtcore " +PATCHES=( + "${FILESDIR}/${PV}-respect-cflags.patch" +) src_configure() { eqmake5 PREFIX="${EPREFIX}/usr"
