From 27fc57afded7ba4a14773f0427a38545604855f2 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Fri, 7 Aug 2015 18:38:08 +0200 Subject: [PATCH] VLC: some old fixes I never commited. --- .../patches/libdvbpsi-1.2.0.patchset | 40 +++- media-video/vlc/patches/vlc-0.8.6i.patchset | 187 +++++++++++++++++- 2 files changed, 215 insertions(+), 12 deletions(-) diff --git a/media-libs/libdvbpsi/patches/libdvbpsi-1.2.0.patchset b/media-libs/libdvbpsi/patches/libdvbpsi-1.2.0.patchset index f972c3551..1f7efa6ce 100644 --- a/media-libs/libdvbpsi/patches/libdvbpsi-1.2.0.patchset +++ b/media-libs/libdvbpsi/patches/libdvbpsi-1.2.0.patchset @@ -1,4 +1,4 @@ -From d4408b75db31f42e1423b6e706b91822fcb7c6a6 Mon Sep 17 00:00:00 2001 +From 3ca8ed8a00628fcdc914870cc143a248e29b3f62 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 9 Sep 2014 16:24:20 +0000 Subject: Haiku patch @@ -44,7 +44,7 @@ index b878676..0a2e76c 100644 1.8.3.4 -From b58bc8958575425c65d185c49d5c844659250c75 Mon Sep 17 00:00:00 2001 +From 3ea35df0e4f0930789693c45f3914bebcbc75c5c Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Fri, 12 Sep 2014 11:04:58 +0200 Subject: gcc2 fixes. @@ -3356,7 +3356,7 @@ index 18b2ba7..f0aca2b 100644 1.8.3.4 -From 2ee9a5bf1388bf855bf15422a8dd3d732f4ed5c4 Mon Sep 17 00:00:00 2001 +From 5daa17f1ef38dd182c3a2bf740ba0d0c0c9c5f2a Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Fri, 12 Sep 2014 12:00:43 +0200 Subject: Fix headers for gcc2 @@ -3431,3 +3431,37 @@ index f0f4fa3..c1e3117 100644 -- 1.8.3.4 + +From dc3ff2271738d7bacd2388a0588f120f77a103f2 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Fri, 19 Sep 2014 11:30:08 +0200 +Subject: Add missing includes for size_t. + + +diff --git a/src/descriptor.h b/src/descriptor.h +index e8c4f7f..a45d907 100644 +--- a/src/descriptor.h ++++ b/src/descriptor.h +@@ -36,6 +36,7 @@ + #define _DVBPSI_DESCRIPTOR_H_ + + #include ++#include + + #ifdef __cplusplus + extern "C" { +diff --git a/src/dvbpsi.h b/src/dvbpsi.h +index d8489f1..8f24c8b 100644 +--- a/src/dvbpsi.h ++++ b/src/dvbpsi.h +@@ -36,6 +36,7 @@ + #define _DVBPSI_DVBPSI_H_ + + #include ++#include + + #define DVBPSI_VERSION 1.2.0 /*!< Human readible DVBPSI version*/ + #define DVBPSI_VERSION_INT ((1<<16)+(2<<8)+0) /*!< Machine readible DVBPSI version */ +-- +1.8.3.4 + diff --git a/media-video/vlc/patches/vlc-0.8.6i.patchset b/media-video/vlc/patches/vlc-0.8.6i.patchset index f9173ba5d..18dbf465f 100644 --- a/media-video/vlc/patches/vlc-0.8.6i.patchset +++ b/media-video/vlc/patches/vlc-0.8.6i.patchset @@ -1,4 +1,4 @@ -From 06f68b888f98031031f7b230be58bdb1cd57674d Mon Sep 17 00:00:00 2001 +From df88a1f9a435ed41d67ba98deb2fcaba6c5ff3b0 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 3 Sep 2014 22:18:59 +0200 Subject: applying patch vlc-0.8.6i.patch @@ -358,7 +358,7 @@ index ecd1a01..98b9b16 100644 2.2.2 -From 9c98e262f8bd27c3d435d3df476158d89ce8039c Mon Sep 17 00:00:00 2001 +From 383f945280a82d68b0b8ce81f53557d57c6a3b13 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Thu, 4 Sep 2014 22:36:37 +0200 Subject: FFmpeg 0.10 fix. @@ -389,7 +389,7 @@ index ad7cfc3..7eba486 100644 2.2.2 -From 011b0e13bf81d7998f49d14dae9c50087b8b4f34 Mon Sep 17 00:00:00 2001 +From fd45aaf97d28bfbd87a576400f62688f89f95158 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Thu, 4 Sep 2014 22:37:02 +0200 Subject: ffmpeg 0.10 fixes. @@ -584,7 +584,7 @@ index 2eff2ba..fd9dc18 100644 2.2.2 -From 23f6a0e6797dfef12d6738e64896ad0c387c113e Mon Sep 17 00:00:00 2001 +From 644e2900d633733a6c6c44ce47cef93397f10d23 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Thu, 4 Sep 2014 23:00:02 +0200 Subject: Cinepak: gcc2 fixes. @@ -624,7 +624,7 @@ index b30ea78..c8fe9d1 100644 2.2.2 -From 4dc9d4f85fa00c5cfa83320643f585ae4424c5c7 Mon Sep 17 00:00:00 2001 +From 9d5276bae39aedc15b6ed9f155fc86d30dffec76 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Thu, 11 Sep 2014 08:39:13 +0200 Subject: gcc2, BeOS vs Haiku and ffmpeg 0.10 fixes. @@ -1258,7 +1258,7 @@ index f5c3a07..8d6cb19 100644 2.2.2 -From ed643155f745ac33c6cf9d9cb19ba0acee1a093a Mon Sep 17 00:00:00 2001 +From c3125e744f813c525d9cd78a2ffc52352f0d0fca Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 15 Sep 2014 21:24:33 +0200 Subject: Fix build with modern libpng. @@ -1291,7 +1291,7 @@ index 21aa111..5284dda 100644 2.2.2 -From 912c838e4283cf098f748697d21090ae91a8b0bb Mon Sep 17 00:00:00 2001 +From 9f586fbfbde949bc5bc1911b4166daa4e6cfd29a Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 15 Sep 2014 21:45:27 +0200 Subject: Fix build with modern Matroska @@ -1390,7 +1390,7 @@ index d3ae27f..9271f57 100644 2.2.2 -From 732661f7aeb6bcdd28e8ca460c980464d1e285e9 Mon Sep 17 00:00:00 2001 +From 09a45fde0746175260e0b006420b4e398af73451 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 15 Sep 2014 22:01:42 +0200 Subject: gcc2 fix. @@ -1438,7 +1438,7 @@ index 3a8def1..1745819 100644 2.2.2 -From a089f84039e379bd873eb8b55d5fe2e8874769a2 Mon Sep 17 00:00:00 2001 +From 47e847c13fd884a1a370ab275884f45107ce38a2 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 16 Sep 2014 10:11:21 +0200 Subject: gnutls gcc2 fixes. @@ -1568,3 +1568,172 @@ index 0000000..86a1d6c -- 2.2.2 + +From 45454c04e7af47bb18a18fdd4f3006e8a95b4b43 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Fri, 19 Sep 2014 11:05:28 +0200 +Subject: Add resources (icon and app infos) + + +diff --git a/vlc.rdef b/vlc.rdef +new file mode 100644 +index 0000000..86a1d6c +--- /dev/null ++++ b/vlc.rdef +@@ -0,0 +1,47 @@ ++ ++resource app_flags B_SINGLE_LAUNCH | B_ARGV_ONLY; ++ ++resource app_version { ++ major = 0, ++ middle = 8, ++ minor = 6, ++ ++ variety = B_APPV_FINAL, ++ internal = 0, ++ ++ short_info = "VideoLAN Client", ++ long_info = "A multi-platform multimedia player." ++}; ++ ++resource app_signature "application/x-vnd.videolan-vlc"; ++ ++resource file_types message { ++ "types" = "application/x-asf", ++ "types" = "audio", ++ "types" = "video" ++}; ++ ++resource vector_icon { ++ $"6E6369660A0500020006023B69C90000000000003B23A04AC3EF4AE6A9007C45" ++ $"03FFD3893303F2A541020006033D79BF0000000000003D324D49E2A74A24F500" ++ $"FFE8CF7FD18021FFF49119020006023AB37E0000000000003D324D4B3D534961" ++ $"EB00A94604FFDC7D0B020016033B480D0000000000003AC58F49C2784A87EA00" ++ $"FF7FCCFFE4020006033BDD210000000000003B67CD49C2A749821E00FFE8CF7F" ++ $"B96205FFD47505020006033AA07A0000000000003A50B649C2784A547F00FFE8" ++ $"CF7FC36E0AFFEA87130200060338E8A800000000000038905449C28F47E0EE00" ++ $"FFE8CF7FC57210FFF491190401780C0605E202426045574E6048604A60465746" ++ $"0605F2032E484C42B54E42B54EC06FB49E3D22BFB322BD632238B54EBCA8B49B" ++ $"38B54E0A063A3C224C224E425E584858460A073F523F42C738C1713A3C224C42" ++ $"5BC60BC5400A055846C738C1713F423F52C60BC5400A04425E425B584658480A" ++ $"04224E224C425B425E02062EC3102EC3102EC4993D52345246524CC3104CC499" ++ $"4CC310C3A2BFF9C3A2BFF949C18B3D4744473647B978BFFE31C18BB978BFFE02" ++ $"063D4736474447C3A2BFF94AC128C3A2BFF9C2C4BD00C2C4BD0047BE1B3D3E43" ++ $"3E373EBA5939BA85BE1BBA5939B978BFFEB978BFFE30C1280206C2C4BD0047BE" ++ $"1BC2C4BD00C1E3B9F8C1E3B9F845BB0D3D3542353835BB36B9FB35BB0DBB36B9" ++ $"FBBA5939BA593933BE1B3D3E373E433E0206C1E3B9F845BB0DC1E3B9F8C13CB7" ++ $"B4C13CB7B443B8613D2E412E392EBBE2B7A337B861BBE2B7A3BB36B9FBBB36B9" ++ $"FB35BB0D3D35383542350206C13CB7B443B861C13CB7B442B55342B553C06FB4" ++ $"A03D22BFB322BD632238B553BCA8B49E38B553BBE2B7A3BBE2B7A337B8613D2E" ++ $"392E412E0A0A090100000A000201021001178400040A010105000A020106000A" ++ $"030103000A040104000A060107000A070109000A0502080A000A08010B00" ++}; +-- +1.8.3.4 + + +From 7765cafb91e4ed524703786e08a90dcc523d1d9d Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Fri, 19 Sep 2014 11:05:54 +0200 +Subject: gcc4 fixes provided by Diver. + + +diff --git a/modules/gui/beos/DrawingTidbits.cpp b/modules/gui/beos/DrawingTidbits.cpp +index f9a145a..d2fa667 100644 +--- a/modules/gui/beos/DrawingTidbits.cpp ++++ b/modules/gui/beos/DrawingTidbits.cpp +@@ -23,6 +23,7 @@ + *****************************************************************************/ + + #include ++#include + + #include + #include +diff --git a/modules/gui/beos/MediaControlView.cpp b/modules/gui/beos/MediaControlView.cpp +index ce52842..d4f102f 100644 +--- a/modules/gui/beos/MediaControlView.cpp ++++ b/modules/gui/beos/MediaControlView.cpp +@@ -86,7 +86,8 @@ MediaControlView::MediaControlView( intf_thread_t * _p_intf, BRect frame) + fBottomControlHeight(0.0), + fIsEnabled( true ) + { +- BRect frame(0.0, 0.0, 10.0, 10.0); ++ frame = BRect(0.0, 0.0, 10.0, 10.0); ++ + + // Seek Slider + fSeekSlider = new SeekSlider( p_intf, frame, "seek slider", this ); +diff --git a/modules/gui/beos/TransportButton.cpp b/modules/gui/beos/TransportButton.cpp +index 423f3c4..93fadd6 100644 +--- a/modules/gui/beos/TransportButton.cpp ++++ b/modules/gui/beos/TransportButton.cpp +@@ -29,10 +29,13 @@ + #include + + #include ++#include + + #include "TransportButton.h" + #include "DrawingTidbits.h" + ++using namespace std; ++ + class BitmapStash { + // Bitmap stash is a simple class to hold all the lazily-allocated + // bitmaps that the TransportButton needs when rendering itself. +-- +1.8.3.4 + + +From 85eceaf25f4ac9f1a99d88526d8436abfcad2f8d Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Fri, 19 Sep 2014 11:10:21 +0200 +Subject: Enable some BeOS quirks also for Haiku. + +* Correct settings directory +* Disable "running as root" warning +* Change BeOS > Haiku in about window. + +diff --git a/include/vlc_config.h b/include/vlc_config.h +index bf14def..5285669 100644 +--- a/include/vlc_config.h ++++ b/include/vlc_config.h +@@ -45,7 +45,7 @@ + #define THREAD_COND_TIMEOUT 1 + + /* The configuration file and directory */ +-#ifdef SYS_BEOS ++#if defined(SYS_BEOS) || defined(__HAIKU__) + # define CONFIG_DIR "config/settings/VideoLAN Client" + #elif __APPLE__ + # define CONFIG_DIR "Library/Preferences/VLC" +diff --git a/modules/gui/beos/InterfaceWindow.cpp b/modules/gui/beos/InterfaceWindow.cpp +index ecc9aea..fdd827d 100644 +--- a/modules/gui/beos/InterfaceWindow.cpp ++++ b/modules/gui/beos/InterfaceWindow.cpp +@@ -392,7 +392,7 @@ void InterfaceWindow::MessageReceived( BMessage * p_message ) + BAlert * alert; + + alert = new BAlert( "VLC media player" VERSION, +- "VLC media player" VERSION " (BeOS interface)\n\n" ++ "VLC media player" VERSION " (Haiku interface)\n\n" + "The VideoLAN team \n" + "http://www.videolan.org/", _("OK") ); + alert->Go(); +diff --git a/src/network/rootwrap.c b/src/network/rootwrap.c +index 604ba0a..49389af 100644 +--- a/src/network/rootwrap.c ++++ b/src/network/rootwrap.c +@@ -25,7 +25,7 @@ + # include + #endif + +-#if defined (HAVE_GETEUID) && !defined (SYS_BEOS) ++#if defined (HAVE_GETEUID) && !defined (SYS_BEOS) && !defined(__HAIKU__) + # define ENABLE_ROOTWRAP 1 + #endif + +-- +1.8.3.4 +