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: fix deskbar link

Browse Source
This commit is contained in:
Gerasim Troeglazov
2024-12-13 16:05:11 +10:00
parent 16a61ff785
commit ce7e14ab64
2 changed files with 13 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
media-video/vlc/patches/vlc-3.0.21.patchset
View File

@@ -1,6 +1,6 @@
From 6d4c7201761b2f08a8451a26594f974ec51b2eef Mon Sep 17 00:00:00 2001
From f6542ddc8e22bede9588c9a3f88b52efc1c1a8aa Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 12 Dec 2024 22:24:16 +1000
Date: Fri, 13 Dec 2024 15:57:06 +1000
Subject: Add Haiku support
@@ -151,10 +151,10 @@ index 8fa2a87..12973c6 100644
enable_xcb="no"
diff --git a/haiku/VLCLauncher.cpp b/haiku/VLCLauncher.cpp
new file mode 100644
index 0000000..11e4423
index 0000000..01be58b
--- /dev/null
+++ b/haiku/VLCLauncher.cpp
@@ -0,0 +1,89 @@
@@ -0,0 +1,83 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
@@ -187,13 +187,7 @@ index 0000000..11e4423
+BString
+VLCLauncherApp::GetVLCPath(void)
+{
+ app_info inf;
+ be_app->GetAppInfo(&inf);
+ BPath binPath = BPath(&(inf.ref));
+ BPath appPath;
+ binPath.GetParent(&appPath);
+ appPath.Append("VLC");
+ return appPath.Path();
+ return "VLC";
+}
+
+void
@@ -209,7 +203,7 @@ index 0000000..11e4423
+ if (ret != B_OK || type != B_REF_TYPE)
+ return;
+
+ BString commandLine = "VLC";
+ BString commandLine = GetVLCPath();
+
+ entry_ref ref;
+ for (int32 i = 0; i < count; i++) {
@@ -1055,16 +1049,17 @@ index 8cfdab3..fedc90f 100644
// By default the widget is unintialized and should not be displayed
diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index 8f2cea4..ea46cc6 100644
index 8f2cea4..2687109 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -375,6 +375,13 @@ if HAVE_WIN32
@@ -375,6 +375,14 @@ if HAVE_WIN32
vout_LTLIBRARIES += libdrawable_plugin.la
endif
+### HAIKU ###
+libhaiku_vout_plugin_la_SOURCES = video_output/haiku.cpp
+libhaiku_vout_plugin_la_LIBADD = -lbe
+libhaiku_vout_plugin_la_LIBADD = $(QT_LIBS) $(LIBS_qt) -lbe
+libhaiku_vout_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(QT_CFLAGS) $(CXXFLAGS_qt)
+if HAVE_HAIKU
+vout_LTLIBRARIES += libhaiku_vout_plugin.la
+endif
@@ -1072,7 +1067,7 @@ index 8f2cea4..ea46cc6 100644
### OS/2 ###
if HAVE_OS2
vout_LTLIBRARIES += libdrawable_plugin.la
@@ -441,9 +448,11 @@ libcaca_plugin_la_CFLAGS = $(AM_CFLAGS) $(CACA_CFLAGS)
@@ -441,9 +449,11 @@ libcaca_plugin_la_CFLAGS = $(AM_CFLAGS) $(CACA_CFLAGS)
libcaca_plugin_la_LIBADD = libevent_thread.la $(CACA_LIBS)
if !HAVE_WIN32
if !HAVE_DARWIN
@@ -2318,27 +2313,3 @@ index 36aaa9d..0ac6b4f 100644
--
2.45.2
From 46aabf94bf362e046549a9057f4b8fd00d7cadf8 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 12 Dec 2024 22:32:18 +1000
Subject: Link haiku video_output module with Qt
diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index ea46cc6..2687109 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -377,7 +377,8 @@ endif
### HAIKU ###
libhaiku_vout_plugin_la_SOURCES = video_output/haiku.cpp
-libhaiku_vout_plugin_la_LIBADD = -lbe
+libhaiku_vout_plugin_la_LIBADD = $(QT_LIBS) $(LIBS_qt) -lbe
+libhaiku_vout_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(QT_CFLAGS) $(CXXFLAGS_qt)
if HAVE_HAIKU
vout_LTLIBRARIES += libhaiku_vout_plugin.la
endif
--
2.45.2

4
media-video/vlc/vlc-3.0.21.recipe
View File

@@ -5,7 +5,7 @@ VCDs, and various streaming protocols."
HOMEPAGE="https://www.videolan.org/vlc/"
COPYRIGHT="1998-2024 VideoLAN"
LICENSE="GNU GPL v2"
REVISION="4"
REVISION="5"
SOURCE_URI="https://download.videolan.org/pub/videolan/vlc/$portVersion/vlc-$portVersion.tar.xz"
SOURCE_DIR="vlc-$portVersion"
CHECKSUM_SHA256="24dbbe1d7dfaeea0994d5def0bbde200177347136dbfe573f5b6a4cee25afbb0"
@@ -239,7 +239,7 @@ INSTALL()
addResourcesToBinaries vlc_launcher.rdef "$appsDir/VLC media player"
addAppDeskbarSymlink $appsDir/VLC "VLC media player"
addAppDeskbarSymlink "$appsDir/VLC media player"
prepareInstalledDevelLibs \
libvlc \