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

VLC: bug fixes

Browse Source 
* fix crash on exit (use libebml >=5)
* fix locale
* main window width by content
This commit is contained in:
Gerasim Troeglazov
2020-10-21 20:15:15 +10:00
parent 05f2141b04
commit 52a44dfef8
2 changed files with 33 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 29c8210e9824704c1d45465711b910ad7ffa7db6 Mon Sep 17 00:00:00 2001
From bf407eddbb948f74609215791f72ec5896c71f79 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 c821731b0546a9394e5c71511a015f8ac7c1b7ea Mon Sep 17 00:00:00 2001
From b360f37626e9de6932b88c157965893da1df1132 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
@@ -2345,65 +2345,36 @@ index 0000000..37af2e8
2.28.0
From d9e29478d5ed6e1740dea4fab23dee293a330ae0 Mon Sep 17 00:00:00 2001
From 538369040fdd2b82028f560f9bd2adbe2d27e0b8 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
Date: Wed, 21 Oct 2020 18:38:28 +1000
Subject: Calculate window width
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
diff --git a/modules/gui/qt/main_interface.cpp b/modules/gui/qt/main_interface.cpp
index f9dc8fe..ba5ad1e 100644
--- a/modules/gui/qt/main_interface.cpp
+++ b/modules/gui/qt/main_interface.cpp
@@ -323,12 +323,18 @@ MainInterface::~MainInterface()
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
void MainInterface::computeMinimumSize()
{
+#ifndef __HAIKU__
int minWidth = 80;
if( menuBar()->isVisible() )
minWidth += controls->sizeHint().width();
.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
setMinimumWidth( minWidth );
-#ifdef __HAIKU__
+#else
+ int minWidth = 32;
+ if( menuBar()->isVisible() )
+ minWidth += fmax(controls->sizeHint().width(), menuBar()->sizeHint().width());
+ setMinimumWidth( minWidth );
+
int minHeight = 50;
minHeight += controls->sizeHint().height();
if( statusBar()->isVisible() )
--
2.28.0

12
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="3"
REVISION="4"
SOURCE_URI="https://download.videolan.org/pub/videolan/vlc/$portVersion/vlc-$portVersion.tar.xz"
CHECKSUM_SHA256="189311d28aa814f106a7b3645211ac52c0b3e2b9f4b348de2f63bab3218086b8"
PATCHES="vlc-$portVersion.patchset"
@@ -36,7 +36,7 @@ REQUIRES="
lib:libdvdcss$secondaryArchSuffix
lib:libdvdnav$secondaryArchSuffix
lib:libdvdread$secondaryArchSuffix
lib:libebml$secondaryArchSuffix
lib:libebml$secondaryArchSuffix >= 5
lib:libenca$secondaryArchSuffix
lib:libfaad$secondaryArchSuffix
lib:libFLAC$secondaryArchSuffix
@@ -64,7 +64,7 @@ REQUIRES="
lib:libtheoradec$secondaryArchSuffix
lib:libtheoraenc$secondaryArchSuffix
lib:libtwolame$secondaryArchSuffix
# lib:libupnp$secondaryArchSuffix # dedlock when scan upnp devices
# lib:libupnp$secondaryArchSuffix # deadlcok during upnp devices scan
lib:libvorbis$secondaryArchSuffix
lib:libvorbisenc$secondaryArchSuffix
lib:libvpx$secondaryArchSuffix
@@ -87,7 +87,7 @@ BUILD_REQUIRES="
devel:libdvdcss$secondaryArchSuffix
devel:libdvdnav$secondaryArchSuffix
devel:libdvdread$secondaryArchSuffix
devel:libebml$secondaryArchSuffix
devel:libebml$secondaryArchSuffix >= 5
devel:libenca$secondaryArchSuffix
devel:libfaad$secondaryArchSuffix
devel:libflac$secondaryArchSuffix
@@ -112,7 +112,7 @@ BUILD_REQUIRES="
devel:libtag$secondaryArchSuffix
devel:libtheora$secondaryArchSuffix
devel:libtwolame$secondaryArchSuffix
# devel:libupnp$secondaryArchSuffix # dedlock when scan upnp devices
# devel:libupnp$secondaryArchSuffix # deadlcok during upnp devices scan
devel:libvorbis$secondaryArchSuffix
devel:libvpx$secondaryArchSuffix
devel:libx264$secondaryArchSuffix
@@ -168,7 +168,7 @@ INSTALL()
{
make install-strip
rm -rf $appsDir/VLC/data/{applications,icons,kde4,vlc}
rm -rf $appsDir/VLC/data/{applications,icons,kde4}
rm -rf $appsDir/VLC/{cvlc,qvlc,rvlc,vlc-wrapper}
rm -rf $developDir $manDir $docDir $appsDir/VLC/lib/pkgconfig
find $appsDir/VLC/lib -name '*.a' -delete