aboutsummaryrefslogtreecommitdiff
path: root/audio/mythplugin-mythmusic/files
diff options
context:
space:
mode:
Diffstat (limited to 'audio/mythplugin-mythmusic/files')
-rw-r--r--audio/mythplugin-mythmusic/files/patch-configure24
-rw-r--r--audio/mythplugin-mythmusic/files/patch-settings.pro19
2 files changed, 9 insertions, 34 deletions
diff --git a/audio/mythplugin-mythmusic/files/patch-configure b/audio/mythplugin-mythmusic/files/patch-configure
deleted file mode 100644
index 98e9512a3f40..000000000000
--- a/audio/mythplugin-mythmusic/files/patch-configure
+++ /dev/null
@@ -1,24 +0,0 @@
---- configure.orig 2018-02-01 11:15:37 UTC
-+++ configure
-@@ -227,6 +227,10 @@ add_cxxflags(){
- append ECXXFLAGS "$@"
- }
-
-+add_cppflags(){
-+ append CPPFLAGS "$@"
-+}
-+
- check_cxx(){
- log check_cxx "$@"
- cat > $TMPCXX
-@@ -582,6 +586,10 @@ CXXPPFLAGS=${CXXPPFLAGS#CXXPPFLAGS=}
- OPENGLV=$(cat mythconfig.mak | grep -e "^CONFIG_OPENGL_VIDEO=yes")
- OPENGLES=$(cat mythconfig.mak | grep -e "^HAVE_GLES2_GL2_H=yes")
-
-+add_cppflags "-I${prefix}/include"
-+add_cxxflags "-I${prefix}/include"
-+add_ldflags "-L${prefix}/lib"
-+
- EXTRALIBS=$(cat mythconfig.mak | grep -e "^EXTRALIBS=")
- EXTRALIBS=${EXTRALIBS#EXTRALIBS=}
-
diff --git a/audio/mythplugin-mythmusic/files/patch-settings.pro b/audio/mythplugin-mythmusic/files/patch-settings.pro
index d5692fbc6692..4eed071e9511 100644
--- a/audio/mythplugin-mythmusic/files/patch-settings.pro
+++ b/audio/mythplugin-mythmusic/files/patch-settings.pro
@@ -1,12 +1,11 @@
-Prevent linking to unneccessary libraries
-
---- settings.pro.orig 2018-02-25 02:52:28 UTC
-+++ settings.pro
-@@ -34,6 +34,7 @@ QMAKE_CXXFLAGS += $$ARCHFLAGS
- QMAKE_CXXFLAGS += $$CONFIG_DIRECTFB_CXXFLAGS
- QMAKE_CXXFLAGS_SHLIB = -DPIC -fPIC
- QMAKE_CXXFLAGS += $$ECXXFLAGS
-+QMAKE_LFLAGS += -Wl,--as-needed
+--- settings.pro.orig 2023-03-19 16:48:43.345465000 +0000
++++ settings.pro 2023-03-19 16:42:27.786115000 +0000
+@@ -8,7 +8,7 @@
+ include(settings2.pro)
- profile:!win32:!macx:CONFIG += debug
+ MY_INSTALL_INCLUDE = $${SYSROOT}$${PREFIX}/include
+-!contains(MY_INSTALL_INCLUDE, /usr/include$) {
++!contains(MY_INSTALL_INCLUDE, /usr/local/include$) {
+ INCLUDEPATH += $${SYSROOT}$${PREFIX}/include
+ }