haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

VLC: disable plugin cache generation

Browse Source
This commit is contained in:
Gerasim Troeglazov
2020-10-21 12:13:41 +10:00
parent df024fadb6
commit a546c6d43e
2 changed files with 66 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
media-video/vlc/patches/vlc-3.0.11.1.patchset
View File

@@ -1,4 +1,4 @@
From 612b829b20f70ead98abe64b484166259644c0f9 Mon Sep 17 00:00:00 2001
From 29c8210e9824704c1d45465711b910ad7ffa7db6 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 20 Oct 2020 16:31:09 +1000
Subject: Add Haiku support
@@ -2240,7 +2240,7 @@ index ff482dc..fe3c06c 100644
2.28.0
From 753d2e8ac3eea065a6751bbfe48811aa192315b3 Mon Sep 17 00:00:00 2001
From c821731b0546a9394e5c71511a015f8ac7c1b7ea Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 20 Oct 2020 18:53:09 +1000
Subject: Add launcher for Haiku
@@ -2344,3 +2344,66 @@ index 0000000..37af2e8
--
2.28.0
From d9e29478d5ed6e1740dea4fab23dee293a330ae0 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 21 Oct 2020 11:56:43 +1000
Subject: Disable plugin cache generation - #Haiku bug #13159
diff --git a/Makefile.am b/Makefile.am
index 35ee1e8..0935900 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -165,15 +165,16 @@ if BUILD_VLC
###############################################################################
# Installing plugins cache
###############################################################################
-install-exec-hook:
- if test "$(build)" = "$(host)"; then \
- PATH="$(DESTDIR)$(bindir):$$PATH" \
- LD_LIBRARY_PATH="$(DESTDIR)$(libdir):$$LD_LIBRARY_PATH" \
- "$(DESTDIR)$(vlclibdir)/vlc-cache-gen$(EXEEXT)" \
- "$(DESTDIR)$(vlclibdir)/plugins" ; \
- else \
- echo "Cross-compilation: cache generation skipped!" ; \
- fi
+#Haiku bug #13159
+#install-exec-hook:
+# if test "$(build)" = "$(host)"; then \
+# PATH="$(DESTDIR)$(bindir):$$PATH" \
+# LD_LIBRARY_PATH="$(DESTDIR)$(libdir):$$LD_LIBRARY_PATH" \
+# "$(DESTDIR)$(vlclibdir)/vlc-cache-gen$(EXEEXT)" \
+# "$(DESTDIR)$(vlclibdir)/plugins" ; \
+# else \
+# echo "Cross-compilation: cache generation skipped!" ; \
+# fi
endif
uninstall-hook:
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 257a065..ebc923f 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -140,10 +140,11 @@ endif
.PHONY: ../modules/plugins.dat
-../modules/plugins.dat: vlc-cache-gen$(EXEEXT)
- $(AM_V_at)rm -f ../modules/plugins.dat
- $(AM_V_GEN)if test "$(build)" = "$(host)"; then \
- ./vlc-cache-gen$(EXEEXT) `realpath ../modules` ; \
- else \
- echo "Cross-compilation: cache generation skipped!" ; \
- fi
+#Haiku bug #13159
+#../modules/plugins.dat: vlc-cache-gen$(EXEEXT)
+# $(AM_V_at)rm -f ../modules/plugins.dat
+# $(AM_V_GEN)if test "$(build)" = "$(host)"; then \
+# ./vlc-cache-gen$(EXEEXT) `realpath ../modules` ; \
+# else \
+# echo "Cross-compilation: cache generation skipped!" ; \
+# fi
--
2.28.0

2
media-video/vlc/vlc-3.0.11.1.recipe
View File

@@ -5,7 +5,7 @@ VCDs, and various streaming protocols."
HOMEPAGE="https://www.videolan.org/vlc/"
COPYRIGHT="1998-2020 VideoLAN"
LICENSE="GNU GPL v2"
REVISION="2"
REVISION="3"
SOURCE_URI="https://download.videolan.org/pub/videolan/vlc/$portVersion/vlc-$portVersion.tar.xz"
CHECKSUM_SHA256="189311d28aa814f106a7b3645211ac52c0b3e2b9f4b348de2f63bab3218086b8"
PATCHES="vlc-$portVersion.patchset"