From 53e76059f68f1fa35ede1219e63759107bc33966 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Wed, 4 Oct 2023 13:32:34 +0000
Subject: [PATCH] vlc, revbumps, fixes 32bit build (#9572)

---
 media-video/vlc/patches/vlc-3.0.18.patchset | 70 ---------------------
 media-video/vlc/vlc-3.0.18.recipe           | 10 +--
 2 files changed, 5 insertions(+), 75 deletions(-)

diff --git a/media-video/vlc/patches/vlc-3.0.18.patchset b/media-video/vlc/patches/vlc-3.0.18.patchset
index 330b3dbc8..33594b6ca 100644
--- a/media-video/vlc/patches/vlc-3.0.18.patchset
+++ b/media-video/vlc/patches/vlc-3.0.18.patchset
@@ -2295,73 +2295,3 @@ index ff482dc..fe3c06c 100644
 -- 
 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
-
diff --git a/media-video/vlc/vlc-3.0.18.recipe b/media-video/vlc/vlc-3.0.18.recipe
index cddf74ca6..efda06701 100644
--- a/media-video/vlc/vlc-3.0.18.recipe
+++ b/media-video/vlc/vlc-3.0.18.recipe
@@ -5,7 +5,7 @@ VCDs, and various streaming protocols."
 HOMEPAGE="https://www.videolan.org/vlc/"
 COPYRIGHT="1998-2022 VideoLAN"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://download.videolan.org/pub/videolan/vlc/$portVersion/vlc-$portVersion.tar.xz"
 SOURCE_DIR="vlc-$portVersion"
 CHECKSUM_SHA256="57094439c365d8aa8b9b41fa3080cc0eef2befe6025bb5cef722accc625aedec"
@@ -38,7 +38,7 @@ REQUIRES="
 	lib:libdvdcss$secondaryArchSuffix
 	lib:libdvdnav$secondaryArchSuffix
 	lib:libdvdread$secondaryArchSuffix
-	lib:libebml$secondaryArchSuffix
+#	lib:libebml$secondaryArchSuffix
 	lib:libenca$secondaryArchSuffix
 	lib:libfaad$secondaryArchSuffix
 	lib:libflac$secondaryArchSuffix
@@ -50,7 +50,7 @@ REQUIRES="
 	lib:libintl$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libmad$secondaryArchSuffix
-	lib:libmatroska$secondaryArchSuffix
+#	lib:libmatroska$secondaryArchSuffix
 	lib:libmodplug$secondaryArchSuffix
 	lib:libmpcdec$secondaryArchSuffix
 	lib:libmpeg2$secondaryArchSuffix
@@ -92,7 +92,7 @@ BUILD_REQUIRES="
 	devel:libdvdcss$secondaryArchSuffix
 	devel:libdvdnav$secondaryArchSuffix
 	devel:libdvdread$secondaryArchSuffix
-	devel:libebml$secondaryArchSuffix
+#	devel:libebml$secondaryArchSuffix
 	devel:libenca$secondaryArchSuffix
 	devel:libfaad$secondaryArchSuffix
 	devel:libflac$secondaryArchSuffix
@@ -103,7 +103,7 @@ BUILD_REQUIRES="
 	devel:libiconv$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libmad$secondaryArchSuffix
-	devel:libmatroska$secondaryArchSuffix
+#	devel:libmatroska$secondaryArchSuffix
 	devel:libmodplug$secondaryArchSuffix
 	devel:libmpcdec$secondaryArchSuffix
 	devel:libmpeg2$secondaryArchSuffix