From d558cb9d8c8f6e69eb75c6335892862c19500a2b Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 22 Oct 2020 14:17:16 +1000 Subject: [PATCH] VLC: add some dependencies --- media-video/vlc/patches/vlc-3.0.11.1.patchset | 15 ++++++------ media-video/vlc/vlc-3.0.11.1.recipe | 24 ++++++++++++------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/media-video/vlc/patches/vlc-3.0.11.1.patchset b/media-video/vlc/patches/vlc-3.0.11.1.patchset index e59d8202b..d34352149 100644 --- a/media-video/vlc/patches/vlc-3.0.11.1.patchset +++ b/media-video/vlc/patches/vlc-3.0.11.1.patchset @@ -1,4 +1,4 @@ -From bf407eddbb948f74609215791f72ec5896c71f79 Mon Sep 17 00:00:00 2001 +From fa64d7bc26a7d7caabdc887fbc52c8179e70e420 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 b360f37626e9de6932b88c157965893da1df1132 Mon Sep 17 00:00:00 2001 +From 12d4864de585f8aea96bc45235f63fb1dd81c83e 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,17 +2345,17 @@ index 0000000..37af2e8 2.28.0 -From 538369040fdd2b82028f560f9bd2adbe2d27e0b8 Mon Sep 17 00:00:00 2001 +From 018f71dbc9dd11335865406bba629c22879aaa36 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Wed, 21 Oct 2020 18:38:28 +1000 +Date: Wed, 21 Oct 2020 23:20:35 +1000 Subject: Calculate window width diff --git a/modules/gui/qt/main_interface.cpp b/modules/gui/qt/main_interface.cpp -index f9dc8fe..ba5ad1e 100644 +index f9dc8fe..d421f4f 100644 --- a/modules/gui/qt/main_interface.cpp +++ b/modules/gui/qt/main_interface.cpp -@@ -323,12 +323,18 @@ MainInterface::~MainInterface() +@@ -323,12 +323,17 @@ MainInterface::~MainInterface() void MainInterface::computeMinimumSize() { @@ -2368,8 +2368,7 @@ index f9dc8fe..ba5ad1e 100644 -#ifdef __HAIKU__ +#else + int minWidth = 32; -+ if( menuBar()->isVisible() ) -+ minWidth += fmax(controls->sizeHint().width(), menuBar()->sizeHint().width()); ++ minWidth += fmax(controls->sizeHint().width(), menuBar()->sizeHint().width()); + setMinimumWidth( minWidth ); + int minHeight = 50; diff --git a/media-video/vlc/vlc-3.0.11.1.recipe b/media-video/vlc/vlc-3.0.11.1.recipe index 74830f845..584a99435 100644 --- a/media-video/vlc/vlc-3.0.11.1.recipe +++ b/media-video/vlc/vlc-3.0.11.1.recipe @@ -5,7 +5,7 @@ VCDs, and various streaming protocols." HOMEPAGE="https://www.videolan.org/vlc/" COPYRIGHT="1998-2020 VideoLAN" LICENSE="GNU GPL v2" -REVISION="4" +REVISION="5" SOURCE_URI="https://download.videolan.org/pub/videolan/vlc/$portVersion/vlc-$portVersion.tar.xz" CHECKSUM_SHA256="189311d28aa814f106a7b3645211ac52c0b3e2b9f4b348de2f63bab3218086b8" PATCHES="vlc-$portVersion.patchset" @@ -36,13 +36,14 @@ REQUIRES=" lib:libdvdcss$secondaryArchSuffix lib:libdvdnav$secondaryArchSuffix lib:libdvdread$secondaryArchSuffix - lib:libebml$secondaryArchSuffix >= 5 + lib:libebml$secondaryArchSuffix lib:libenca$secondaryArchSuffix lib:libfaad$secondaryArchSuffix - lib:libFLAC$secondaryArchSuffix + lib:libflac$secondaryArchSuffix lib:libfontconfig$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix - lib:libGL$secondaryArchSuffix + lib:libgl$secondaryArchSuffix + lib:libgnutls$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libintl$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix @@ -58,13 +59,14 @@ REQUIRES=" lib:libQt5Gui$secondaryArchSuffix lib:libQt5Widgets$secondaryArchSuffix lib:libsamplerate$secondaryArchSuffix + lib:libschroedinger_1.0$secondaryArchSuffix lib:libspeex$secondaryArchSuffix lib:libswscale$secondaryArchSuffix lib:libtag$secondaryArchSuffix lib:libtheoradec$secondaryArchSuffix lib:libtheoraenc$secondaryArchSuffix lib:libtwolame$secondaryArchSuffix -# lib:libupnp$secondaryArchSuffix # deadlcok during upnp devices scan +# lib:libupnp$secondaryArchSuffix # deadlock during upnp devices scan lib:libvorbis$secondaryArchSuffix lib:libvorbisenc$secondaryArchSuffix lib:libvpx$secondaryArchSuffix @@ -87,13 +89,14 @@ BUILD_REQUIRES=" devel:libdvdcss$secondaryArchSuffix devel:libdvdnav$secondaryArchSuffix devel:libdvdread$secondaryArchSuffix - devel:libebml$secondaryArchSuffix >= 5 + devel:libebml$secondaryArchSuffix devel:libenca$secondaryArchSuffix devel:libfaad$secondaryArchSuffix devel:libflac$secondaryArchSuffix devel:libfontconfig$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix devel:libgl$secondaryArchSuffix + devel:libgnutls$secondaryArchSuffix devel:libiconv$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libmad$secondaryArchSuffix @@ -106,19 +109,21 @@ BUILD_REQUIRES=" devel:libpng16$secondaryArchSuffix devel:libQt5Core$secondaryArchSuffix devel:libsamplerate$secondaryArchSuffix + devel:libschroedinger_1.0$secondaryArchSuffix devel:libspeex$secondaryArchSuffix devel:libssl$secondaryArchSuffix devel:libswscale$secondaryArchSuffix devel:libtag$secondaryArchSuffix devel:libtheora$secondaryArchSuffix devel:libtwolame$secondaryArchSuffix -# devel:libupnp$secondaryArchSuffix # deadlcok during upnp devices scan +# devel:libupnp$secondaryArchSuffix # deadlock during upnp devices scan devel:libvorbis$secondaryArchSuffix devel:libvpx$secondaryArchSuffix devel:libx264$secondaryArchSuffix devel:libx265$secondaryArchSuffix devel:libxml2$secondaryArchSuffix devel:libz$secondaryArchSuffix + devel:live555$secondaryArchSuffix " BUILD_PREREQUIRES=" @@ -141,7 +146,8 @@ BUILD() export BUILDCC=gcc export CFLAGS="-lgnu -lnetwork" - + export CXXFLAGS="-lgnu -lnetwork" + runConfigure ./configure \ --prefix=$appsDir/VLC \ --bindir=$appsDir/VLC \ @@ -159,7 +165,7 @@ BUILD() --disable-lua make $jobArgs - + cd haiku gcc VLCLauncher.cpp -lbe -o "VLC media player" }