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, bump version, cleanup (#9556)

Browse Source
This commit is contained in:
Schrijvers Luc
2023-10-02 12:49:16 +00:00
committed by GitHub
parent 7d96a3587c
commit 5d47c6c7a3
4 changed files with 82 additions and 1779 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1613
media-video/vlc/patches/vlc-0.8.6i.patchset
View File

File diff suppressed because it is too large Load Diff

92
media-video/vlc/patches/vlc-3.0.17.3.patchset → media-video/vlc/patches/vlc-3.0.18.patchset
View File

@@ -1,4 +1,4 @@
From 5c06cc96787f998a662ef38956a07877499a45ed Mon Sep 17 00:00:00 2001
From 79d3d024416b3170b8af9f95dde6a35792fb5144 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 20 Mar 2022 21:19:46 +1000
Subject: Add Haiku support
@@ -52,7 +52,7 @@ index 0f42e78..0ce5aef 100644
#include <limits.h>
#include <stdlib.h>
diff --git a/configure.ac b/configure.ac
index 28a7384..523428e 100644
index e8c7529..f7fe73b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,6 @@ dnl
@@ -122,7 +122,7 @@ index 28a7384..523428e 100644
AS_IF([test "${SYS}" = "mingw32"], [
LDFLAGS="${LDFLAGS} -lssp"
AS_IF([test "${vlc_winstore_app}" != 1], [LDFLAGS="${LDFLAGS} -ladvapi32"])
@@ -1712,7 +1724,7 @@ then
@@ -1700,7 +1712,7 @@ then
fi
AC_ARG_VAR([LUAC], [LUA byte compiler])
AS_IF([test -z "$LUAC"], [
@@ -131,7 +131,7 @@ index 28a7384..523428e 100644
])
AS_IF([test "${LUAC}" = "false"], [
AC_MSG_ERROR([Could not find the LUA byte compiler.])
@@ -2644,7 +2656,7 @@ then
@@ -2613,7 +2625,7 @@ then
VLC_SAVE_FLAGS
CPPFLAGS="${CPPFLAGS} ${POSTPROC_CFLAGS}"
CFLAGS="${CFLAGS} ${POSTPROC_CFLAGS}"
@@ -140,7 +140,7 @@ index 28a7384..523428e 100644
VLC_ADD_PLUGIN([postproc])
VLC_RESTORE_FLAGS
],[
@@ -3122,7 +3134,7 @@ dnl X C Bindings modules
@@ -3091,7 +3103,7 @@ dnl X C Bindings modules
dnl
AC_ARG_ENABLE(xcb,
[ --enable-xcb X11 support with XCB (default enabled)],, [
@@ -832,7 +832,7 @@ index e3c0663..0731923 100644
#ifdef HAVE_LIBAVUTIL_AVUTIL_H
diff --git a/modules/gui/qt/components/controller.cpp b/modules/gui/qt/components/controller.cpp
index 1d417f2..876f53a 100644
index 7bc5728..adbb883 100644
--- a/modules/gui/qt/components/controller.cpp
+++ b/modules/gui/qt/components/controller.cpp
@@ -229,7 +229,11 @@ void AbstractController::createAndAddWidget( QBoxLayout *controlLayout_,
@@ -887,7 +887,7 @@ index b0d0c82..0f33b4f 100644
protected slots:
void toggleAdvanced();
diff --git a/modules/gui/qt/components/interface_widgets.cpp b/modules/gui/qt/components/interface_widgets.cpp
index c1482ac..8c288cb 100644
index 2311fed..e26e099 100644
--- a/modules/gui/qt/components/interface_widgets.cpp
+++ b/modules/gui/qt/components/interface_widgets.cpp
@@ -159,6 +159,9 @@ bool VideoWidget::request( struct vout_window_t *p_wnd )
@@ -913,7 +913,7 @@ index 450889b..e389724 100644
#include <QKeyEvent>
#include <QPushButton>
diff --git a/modules/gui/qt/main_interface.cpp b/modules/gui/qt/main_interface.cpp
index fb67a08..1557159 100644
index 6e66afb..4697e92 100644
--- a/modules/gui/qt/main_interface.cpp
+++ b/modules/gui/qt/main_interface.cpp
@@ -127,7 +127,13 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
@@ -1086,7 +1086,7 @@ index b3ec20c..fe99d31 100644
action->setCheckable( true );
action->setChecked( mi->statusBar()->isVisible() );
diff --git a/modules/gui/qt/qt.cpp b/modules/gui/qt/qt.cpp
index bac56e6..bf207e0 100644
index a7e6c8d..b8c362c 100644
--- a/modules/gui/qt/qt.cpp
+++ b/modules/gui/qt/qt.cpp
@@ -605,6 +605,8 @@ static void *ThreadPlatform( void *obj, char *platform_name )
@@ -1936,7 +1936,7 @@ index 0000000..9f0a2e3
+ }
+}
diff --git a/src/Makefile.am b/src/Makefile.am
index cdf7172..81f0290 100644
index 9b918d2..9dd3801 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -411,6 +411,16 @@ libvlccore_la_SOURCES += \
@@ -2293,5 +2293,75 @@ index ff482dc..fe3c06c 100644
w->inhibit = vlc_inhibit_Create(VLC_OBJECT (window));
if (w->inhibit != NULL)
--
2.30.2
2.37.3
From ae21aed3c8c1d00ca1c3cf74eb659bd99ec0aea7 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Mon, 2 Oct 2023 12:16:26 +0200
Subject: Fix missing declarations for int types
diff --git a/modules/demux/mkv/chapter_command.hpp b/modules/demux/mkv/chapter_command.hpp
index 0ec8bd7..cfa570b 100644
--- a/modules/demux/mkv/chapter_command.hpp
+++ b/modules/demux/mkv/chapter_command.hpp
@@ -27,6 +27,10 @@
#include "mkv.hpp"
+#ifdef __HAIKU__
+#include <SupportDefs.h>
+#endif
+
const int MATROSKA_CHAPTER_CODEC_NATIVE = 0x00;
const int MATROSKA_CHAPTER_CODEC_DVD = 0x01;
diff --git a/modules/demux/mkv/chapters.hpp b/modules/demux/mkv/chapters.hpp
index 35a9737..d0402a5 100644
--- a/modules/demux/mkv/chapters.hpp
+++ b/modules/demux/mkv/chapters.hpp
@@ -29,6 +29,10 @@
#include "mkv.hpp"
+#ifdef __HAIKU__
+#include <SupportDefs.h>
+#endif
+
class chapter_translation_c
{
public:
diff --git a/modules/demux/mkv/matroska_segment.hpp b/modules/demux/mkv/matroska_segment.hpp
index b96759a..1bfe56e 100644
--- a/modules/demux/mkv/matroska_segment.hpp
+++ b/modules/demux/mkv/matroska_segment.hpp
@@ -36,6 +36,10 @@
#include "Ebml_parser.hpp"
+#ifdef __HAIKU__
+#include <SupportDefs.h>
+#endif
+
class EbmlParser;
class chapter_edition_c;
diff --git a/modules/demux/mkv/stream_io_callback.hpp b/modules/demux/mkv/stream_io_callback.hpp
index bc6a378..6d41a94 100644
--- a/modules/demux/mkv/stream_io_callback.hpp
+++ b/modules/demux/mkv/stream_io_callback.hpp
@@ -23,6 +23,10 @@
*****************************************************************************/
#include "mkv.hpp"
+#ifdef __HAIKU__
+#include <SupportDefs.h>
+#endif
+
/*****************************************************************************
* Stream managment
*****************************************************************************/
--
2.37.3

154
media-video/vlc/vlc-0.8.6i.recipe
View File

@@ -1,154 +0,0 @@
SUMMARY="The popular cross-plattform media player"
DESCRIPTION="VLC is a free and open source cross-platform multimedia player \
and framework that plays most multimedia files as well as DVDs, Audio CDs, \
VCDs, and various streaming protocols."
HOMEPAGE="https://www.videolan.org/vlc/"
COPYRIGHT="1998-2008 VideoLAN"
LICENSE="GNU GPL v2"
REVISION="6"
SOURCE_URI="https://download.videolan.org/pub/vlc/$portVersion/vlc-$portVersion.tar.gz"
CHECKSUM_SHA256="e99b3b49efd8cae8cf210ca69a5c81ceeac3b2e7d2b1e79df84c9abee4aa8426"
PATCHES="vlc-$portVersion.patchset"
ADDITIONAL_FILES="vlc.rdef.in"
ARCHITECTURES="?x86_gcc2"
SECONDARY_ARCHITECTURES="?x86"
PROVIDES="
vlc$secondaryArchSuffix = $portVersion
cmd:vlc$secondaryArchSuffix
cmd:vlc_config$secondaryArchSuffix
"
REQUIRES="
haiku$secondaryArchSuffix
lib:liba52$secondaryArchSuffix
lib:libavcodec$secondaryArchSuffix == 53.61.100
# lib:libdvbpsi$secondaryArchSuffix >= 9
lib:libdvdcss$secondaryArchSuffix
lib:libgnutls$secondaryArchSuffix
lib:libgpg_error$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix
lib:libintl$secondaryArchSuffix
"
PROVIDES_devel="
vlc${secondaryArchSuffix}_devel = $portVersion
devel:libbeos$secondaryArchSuffix
devel:libi420_rgb_mmx$secondaryArchSuffix
devel:libi420_ymga_mmx$secondaryArchSuffix
devel:libi420_yuy2_mmx$secondaryArchSuffix
devel:libi422_yuy2_mmx$secondaryArchSuffix
devel:libmemcpy3dn$secondaryArchSuffix
devel:libmemcpymmx$secondaryArchSuffix
devel:libmemcpymmxext$secondaryArchSuffix
devel:libvlc$secondaryArchSuffix
"
REQUIRES_devel="
vlc == $portVersion base
# devel:libdvbpsi$secondaryArchSuffix >= 9
devel:libiconv$secondaryArchSuffix
devel:libintl$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:liba52$secondaryArchSuffix
devel:libavcodec$secondaryArchSuffix == 53.61.100
devel:libbz2$secondaryArchSuffix
devel:libcddb$secondaryArchSuffix
devel:libcdio$secondaryArchSuffix
devel:libdca$secondaryArchSuffix
# devel:libdvbpsi$secondaryArchSuffix >= 9
devel:libdvdcss$secondaryArchSuffix
devel:libdvdnav$secondaryArchSuffix
devel:libdvdread$secondaryArchSuffix
devel:libebml$secondaryArchSuffix
devel:libfaac$secondaryArchSuffix
devel:libfaad$secondaryArchSuffix
devel:libflac$secondaryArchSuffix
devel:libfreetype$secondaryArchSuffix
devel:libfribidi$secondaryArchSuffix
devel:libgcrypt$secondaryArchSuffix
devel:libgl$secondaryArchSuffix
devel:libglu$secondaryArchSuffix
devel:libgnutls$secondaryArchSuffix
devel:libgpg_error$secondaryArchSuffix
devel:libiconv$secondaryArchSuffix
devel:libid3tag$secondaryArchSuffix
devel:libintl$secondaryArchSuffix
devel:libjpeg$secondaryArchSuffix
devel:libmad$secondaryArchSuffix
devel:libmatroska$secondaryArchSuffix
devel:libmodplug$secondaryArchSuffix
devel:libmp3lame$secondaryArchSuffix
devel:libmpcdec$secondaryArchSuffix
devel:libmpeg2$secondaryArchSuffix
devel:libogg$secondaryArchSuffix
devel:libpng$secondaryArchSuffix
devel:libpostproc$secondaryArchSuffix
devel:libsmbclient$secondaryArchSuffix
devel:libspeex$secondaryArchSuffix
devel:libtheora$secondaryArchSuffix
devel:libtwolame$secondaryArchSuffix
devel:libvcdinfo$secondaryArchSuffix
devel:libvorbis$secondaryArchSuffix
devel:libxml2$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
# We need a recipe for an old version of this that will still build with gcc2.
# devel:libx264$secondaryArchSuffix
BUILD_PREREQUIRES="
cmd:ar$secondaryArchSuffix
cmd:autoconf
cmd:bison
cmd:gcc$secondaryArchSuffix
cmd:libtoolize$secondaryArchSuffix
cmd:make
cmd:pkg_config$secondaryArchSuffix
cmd:sed
cmd:which
cmd:xargs
"
BUILD()
{
autoconf
runConfigure ./configure CFLAGS="-Davcodec_init=avcodec_register_all" \
--disable-wxwidgets --disable-skins2 --enable-shared \
--enable-screen --enable-dvdread --enable-smb --enable-faad \
--enable-twolame --with-ffmpeg-dca --with-ffmpeg-theora --enable-flac
make # Multi-job build is not working
}
INSTALL()
{
make install
prepareInstalledDevelLibs libvlc vlc/libbeos vlc/libi420_rgb_mmx \
vlc/libi420_ymga_mmx vlc/libi420_yuy2_mmx vlc/libi422_yuy2_mmx \
vlc/libmemcpy3dn vlc/libmemcpymmx vlc/libmemcpymmxext
local APP_SIGNATURE="application/x-vnd.videolan-vlc"
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
local MINOR="`echo "$portVersion" | cut -d. -f3 | tr -d '[:alpha:]'`"
local LONG_INFO="$SUMMARY"
sed \
-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
-e "s|@MAJOR@|$MAJOR|" \
-e "s|@MIDDLE@|$MIDDLE|" \
-e "s|@MINOR@|$MINOR|" \
-e "s|@LONG_INFO@|$LONG_INFO|" \
$portDir/additional-files/vlc.rdef.in > vlc.rdef
addResourcesToBinaries vlc.rdef $binDir/vlc
addAppDeskbarSymlink $binDir/vlc "VLC media player"
packageEntries devel $developDir
}
TEST()
{
make check
}

2
media-video/vlc/vlc-3.0.17.3.recipe → media-video/vlc/vlc-3.0.18.recipe
View File

@@ -8,7 +8,7 @@ LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://download.videolan.org/pub/videolan/vlc/$portVersion/vlc-$portVersion.tar.xz"
SOURCE_DIR="vlc-$portVersion"
CHECKSUM_SHA256="6f7e90ef8973d31d96de64db817173e345150829717a94084b1bb8321cde2014"
CHECKSUM_SHA256="57094439c365d8aa8b9b41fa3080cc0eef2befe6025bb5cef722accc625aedec"
PATCHES="vlc-$portVersion.patchset"
ADDITIONAL_FILES="
vlc.rdef.in