Vlc (#11081)

* vlc, revbump, split and add devel package * vlc, revbump, split and add devel package
2026-04-08 21:00:05 +02:00 · 2024-09-10 12:46:06 +02:00
parent 20d9361b5f
commit 5a2beb399c
2 changed files with 148 additions and 56 deletions
--- a/media-video/vlc/patches/vlc-3.0.21.patchset
+++ b/media-video/vlc/patches/vlc-3.0.21.patchset
@@ -1,4 +1,4 @@
-From 79d3d024416b3170b8af9f95dde6a35792fb5144 Mon Sep 17 00:00:00 2001
+From f786e23e5b814429b64590cf3b869f1c353e5ffd 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 e8c7529..f7fe73b 100644
+index 8fa2a87..12973c6 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -46,7 +46,6 @@ dnl
@@ -94,7 +94,7 @@ index e8c7529..f7fe73b 100644
 AC_REPLACE_FUNCS([gettimeofday])
 AC_CHECK_FUNC(fdatasync,,
   [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
-@@ -972,8 +979,10 @@ AC_SEARCH_LIBS(connect, [socket], [
+@@ -971,8 +978,10 @@ AC_SEARCH_LIBS(connect, [socket], [
   AS_IF([test "${SYS}" = "mingw32"], [
     SOCKET_LIBS="-lws2_32 -liphlpapi"
   ])
@@ -106,7 +106,7 @@ index e8c7529..f7fe73b 100644
 AC_SEARCH_LIBS([inet_pton], [nsl], [
  AS_IF([test "$ac_cv_search_inet_pton" != "none required"], [
     SOCKET_LIBS="$ac_cv_search_inet_pton $SOCKET_LIBS"
-@@ -1186,9 +1195,12 @@ AH_BOTTOM([
+@@ -1185,9 +1194,12 @@ AH_BOTTOM([
     AS_IF([test "${ac_cv_c_omit_frame_pointer}" = "no"], [VLC_RESTORE_FLAGS])
   ])
 
@@ -122,7 +122,7 @@ index e8c7529..f7fe73b 100644
   AS_IF([test "${SYS}" = "mingw32"], [
       LDFLAGS="${LDFLAGS} -lssp"
       AS_IF([test "${vlc_winstore_app}" != 1], [LDFLAGS="${LDFLAGS} -ladvapi32"])
-@@ -1700,7 +1712,7 @@ then
+@@ -1704,7 +1716,7 @@ then
   fi
   AC_ARG_VAR([LUAC], [LUA byte compiler])
   AS_IF([test -z "$LUAC"], [
@@ -131,7 +131,7 @@ index e8c7529..f7fe73b 100644
   ])
   AS_IF([test "${LUAC}" = "false"], [
     AC_MSG_ERROR([Could not find the LUA byte compiler.])
-@@ -2613,7 +2625,7 @@ then
+@@ -2642,7 +2654,7 @@ then
       VLC_SAVE_FLAGS
       CPPFLAGS="${CPPFLAGS} ${POSTPROC_CFLAGS}"
       CFLAGS="${CFLAGS} ${POSTPROC_CFLAGS}"
@@ -140,7 +140,7 @@ index e8c7529..f7fe73b 100644
       VLC_ADD_PLUGIN([postproc])
       VLC_RESTORE_FLAGS
     ],[
-@@ -3091,7 +3103,7 @@ dnl  X C Bindings modules
+@@ -3120,7 +3132,7 @@ dnl  X C Bindings modules
 dnl
 AC_ARG_ENABLE(xcb,
   [  --enable-xcb            X11 support with XCB (default enabled)],, [
@@ -245,7 +245,7 @@ index 0000000..37af2e8
 +
 +
 diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
-index 2e8a145..5bea57d 100644
+index 861cb4c..254e6ae 100644
 --- a/include/vlc_fixups.h
 +++ b/include/vlc_fixups.h
@@ -103,7 +103,7 @@ typedef struct
@@ -291,7 +291,7 @@ index 2e8a145..5bea57d 100644
 #ifndef HAVE_STRUCT_TIMESPEC
 struct timespec {
 diff --git a/include/vlc_vout_display.h b/include/vlc_vout_display.h
-index 36f1227..e31d87d 100644
+index 80761c8..b96e287 100644
 --- a/include/vlc_vout_display.h
 +++ b/include/vlc_vout_display.h
@@ -81,7 +81,7 @@ enum {
@@ -331,7 +331,7 @@ index 36f1227..e31d87d 100644
                                                     bool is_window_fullscreen)
 {
 diff --git a/include/vlc_vout_window.h b/include/vlc_vout_window.h
-index edc94fe..88eee0c 100644
+index 3a613d4..10aa918 100644
 --- a/include/vlc_vout_window.h
 +++ b/include/vlc_vout_window.h
@@ -53,6 +53,7 @@ enum vout_window_type {
@@ -351,7 +351,7 @@ index edc94fe..88eee0c 100644
 
     /** Display server (mandatory)
 diff --git a/include/vlc_vout_wrapper.h b/include/vlc_vout_wrapper.h
-index b808f55..4f918d5 100644
+index 96b954a..12ee19d 100644
 --- a/include/vlc_vout_wrapper.h
 +++ b/include/vlc_vout_wrapper.h
@@ -62,7 +62,7 @@ static inline void vout_display_Display(vout_display_t *vd,
@@ -364,7 +364,7 @@ index b808f55..4f918d5 100644
 #endif
     vlc_rational_t sar;
 diff --git a/modules/audio_output/Makefile.am b/modules/audio_output/Makefile.am
-index 13cf5ba..c60ea48 100644
+index bb4ac65..3907268 100644
 --- a/modules/audio_output/Makefile.am
 +++ b/modules/audio_output/Makefile.am
@@ -93,6 +93,12 @@ if HAVE_SNDIO
@@ -781,7 +781,7 @@ index 0000000..025c285
 +    return size;
 +}
 diff --git a/modules/codec/avcodec/avcommon_compat.h b/modules/codec/avcodec/avcommon_compat.h
-index e3c0663..0731923 100644
+index 9d16b3d..6c2f34c 100644
 --- a/modules/codec/avcodec/avcommon_compat.h
 +++ b/modules/codec/avcodec/avcommon_compat.h
@@ -78,6 +78,46 @@
@@ -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 7bc5728..adbb883 100644
+index 3adfe67..7572c74 100644
 --- a/modules/gui/qt/components/controller.cpp
 +++ b/modules/gui/qt/components/controller.cpp
@@ -229,7 +229,11 @@ void AbstractController::createAndAddWidget( QBoxLayout *controlLayout_,
@@ -861,7 +861,7 @@ index 7bc5728..adbb883 100644
 
     controlLayout->addLayout( controlLayout1 );
 diff --git a/modules/gui/qt/components/controller.hpp b/modules/gui/qt/components/controller.hpp
-index b0d0c82..0f33b4f 100644
+index ab7b29f..ed6480a 100644
 --- a/modules/gui/qt/components/controller.hpp
 +++ b/modules/gui/qt/components/controller.hpp
@@ -210,10 +210,10 @@ public:
@@ -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 2311fed..e26e099 100644
+index 4a0a0da..dea615c 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 )
@@ -901,7 +901,7 @@ index 2311fed..e26e099 100644
             p_wnd->handle.nsobject = (void *)stable->winId();
             break;
 diff --git a/modules/gui/qt/dialogs/plugins.cpp b/modules/gui/qt/dialogs/plugins.cpp
-index 450889b..e389724 100644
+index 0ed8313..86c148c 100644
 --- a/modules/gui/qt/dialogs/plugins.cpp
 +++ b/modules/gui/qt/dialogs/plugins.cpp
@@ -53,6 +53,7 @@
@@ -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 6e66afb..4697e92 100644
+index 095c765..985c286 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 )
@@ -1046,7 +1046,7 @@ index 6e66afb..4697e92 100644
     sysTray->setToolTip( qtr( "VLC media player" ));
 
 diff --git a/modules/gui/qt/menus.cpp b/modules/gui/qt/menus.cpp
-index b3ec20c..fe99d31 100644
+index 460653c..42ac832 100644
 --- a/modules/gui/qt/menus.cpp
 +++ b/modules/gui/qt/menus.cpp
@@ -486,7 +486,7 @@ QMenu *VLCMenuBar::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterfac
@@ -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 a7e6c8d..b8c362c 100644
+index cefc758..69651a3 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 )
@@ -1099,7 +1099,7 @@ index a7e6c8d..b8c362c 100644
         else
             msg_Err( p_intf, "unknown Qt platform: %s", qtu(platform) );
 diff --git a/modules/gui/qt/util/timetooltip.cpp b/modules/gui/qt/util/timetooltip.cpp
-index 70a8e6d..f6237bc 100644
+index 8cfdab3..b955a18 100644
 --- a/modules/gui/qt/util/timetooltip.cpp
 +++ b/modules/gui/qt/util/timetooltip.cpp
@@ -27,7 +27,11 @@
@@ -1115,10 +1115,10 @@ index 70a8e6d..f6237bc 100644
 TimeTooltip::TimeTooltip( QWidget *parent ) :
     QWidget( parent )
 diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
-index 78c06cf..0ae24ec 100644
+index 8f2cea4..ea46cc6 100644
 --- a/modules/video_output/Makefile.am
 +++ b/modules/video_output/Makefile.am
-@@ -356,6 +356,13 @@ if HAVE_WIN32
+@@ -375,6 +375,13 @@ if HAVE_WIN32
 vout_LTLIBRARIES += libdrawable_plugin.la
 endif
 
@@ -1132,7 +1132,7 @@ index 78c06cf..0ae24ec 100644
 ### OS/2 ###
 if HAVE_OS2
 vout_LTLIBRARIES += libdrawable_plugin.la
-@@ -422,9 +429,11 @@ libcaca_plugin_la_CFLAGS = $(AM_CFLAGS) $(CACA_CFLAGS)
+@@ -441,9 +448,11 @@ libcaca_plugin_la_CFLAGS = $(AM_CFLAGS) $(CACA_CFLAGS)
 libcaca_plugin_la_LIBADD = libevent_thread.la $(CACA_LIBS)
 if !HAVE_WIN32
 if !HAVE_DARWIN
@@ -1936,7 +1936,7 @@ index 0000000..9f0a2e3
 +	}
 +}
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 9b918d2..9dd3801 100644
+index 03f6894..a2d37db 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
@@ -411,6 +411,16 @@ libvlccore_la_SOURCES += \
@@ -2095,10 +2095,10 @@ index 0000000..1c26497
 +{
 +}
 diff --git a/src/modules/bank.c b/src/modules/bank.c
-index 2e67a0d..e927851 100644
+index 52037d5..5bee696 100644
 --- a/src/modules/bank.c
 +++ b/src/modules/bank.c
-@@ -172,6 +172,7 @@ static vlc_plugin_t *module_InitStatic(vlc_plugin_cb entry)
+@@ -176,6 +176,7 @@ static vlc_plugin_t *module_InitStatic(vlc_plugin_cb entry)
     return lib;
 }
 
@@ -2106,7 +2106,7 @@ index 2e67a0d..e927851 100644
 #if defined(__ELF__) || !HAVE_DYNAMIC_PLUGINS
 # ifdef __GNUC__
 __attribute__((weak))
-@@ -192,9 +193,9 @@ static void module_InitStaticModules(void)
+@@ -196,9 +197,9 @@ static void module_InitStaticModules(void)
             vlc_plugin_store(lib);
     }
 }
@@ -2119,7 +2119,7 @@ index 2e67a0d..e927851 100644
 #ifdef HAVE_DYNAMIC_PLUGINS
 static const char vlc_entry_name[] = "vlc_entry" MODULE_SUFFIX;
 diff --git a/src/network/io.c b/src/network/io.c
-index 603624a..256030b 100644
+index 703a792..8ec75a1 100644
 --- a/src/network/io.c
 +++ b/src/network/io.c
@@ -192,7 +192,9 @@ int *net_Listen (vlc_object_t *p_this, const char *psz_host,
@@ -2146,7 +2146,7 @@ index db51004..9ae11dd 100644
     freelocale(loc);
     return buf;
 diff --git a/src/video_output/display.c b/src/video_output/display.c
-index ba4dba0..49c7901 100644
+index 869c575..268dda0 100644
 --- a/src/video_output/display.c
 +++ b/src/video_output/display.c
@@ -341,7 +341,7 @@ typedef struct {
@@ -2231,7 +2231,7 @@ index ba4dba0..49c7901 100644
 #endif
         state->sar = osys->sar_initial;
 diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
-index d936d42..8b9a976 100644
+index 085067c..e65b9bf 100644
 --- a/src/video_output/video_output.c
 +++ b/src/video_output/video_output.c
@@ -570,7 +570,7 @@ void vout_ControlChangeViewpoint(vout_thread_t *vout,
@@ -2261,7 +2261,7 @@ index d936d42..8b9a976 100644
     else /* FIXME: remove this event */
     if (vout->p->display.vd != NULL)
         vout_display_SendWindowState(vout->p->display.vd, state);
-@@ -1514,7 +1514,7 @@ static int ThreadStart(vout_thread_t *vout, vout_display_state_t *state)
+@@ -1516,7 +1516,7 @@ static int ThreadStart(vout_thread_t *vout, vout_display_state_t *state)
     if (!state) {
         VoutGetDisplayCfg(vout, &state_default.cfg, vout->p->display.title);
 
@@ -2270,7 +2270,7 @@ index d936d42..8b9a976 100644
         bool below = var_InheritBool(vout, "video-wallpaper");
         bool above = var_InheritBool(vout, "video-on-top");
 
-@@ -1643,7 +1643,7 @@ static int ThreadReinit(vout_thread_t *vout,
+@@ -1645,7 +1645,7 @@ static int ThreadReinit(vout_thread_t *vout,
 
     vout_ReinitInterlacingSupport(vout);
 
@@ -2280,7 +2280,7 @@ index d936d42..8b9a976 100644
 #endif
     {
 diff --git a/src/video_output/window.c b/src/video_output/window.c
-index ff482dc..fe3c06c 100644
+index 36aaa9d..95b2e74 100644
 --- a/src/video_output/window.c
 +++ b/src/video_output/window.c
@@ -79,7 +79,7 @@ vout_window_t *vout_window_New(vlc_object_t *obj, const char *module,
@@ -2293,5 +2293,79 @@ index ff482dc..fe3c06c 100644
         w->inhibit = vlc_inhibit_Create(VLC_OBJECT (window));
         if (w->inhibit != NULL)
 -- 
-2.37.3
+2.45.2
+
+
+From 6bb1dc25774228cc4832691658fea05fe66e8f94 Mon Sep 17 00:00:00 2001
+From: Begasus <begasus@gmail.com>
+Date: Tue, 10 Sep 2024 09:24:46 +0200
+Subject: applying patch taglib-2.patch
+
+Kudos to archlinux: https://gitlab.archlinux.org/archlinux/packaging/packages/vlc/-/blob/main/taglib-2.patch
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c..f371485 100644
+--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+         ByteVector res(length, 0);
+         ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+         if (i_read < 0)
+-            return ByteVector::null;
+            return ByteVector();
+         else if ((size_t)i_read != length)
+             res.resize(i_read);
+         return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta )                                                  \
+-    if( !tag->accessor().isNull() && !tag->accessor().isEmpty() )              \
+    if( !tag->accessor().isEmpty() )              \
+         vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta )                                               \
+     if( tag->accessor() )                                                      \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+     MP4::Item list;
+ #define SET( keyName, metaName )                                                             \
+-    if( tag->itemListMap().contains(keyName) )                                               \
+    if( tag->itemMap().contains(keyName) )                                               \
+     {                                                                                        \
+-        list = tag->itemListMap()[keyName];                                                  \
+        list = tag->itemMap()[keyName];                                                  \
+         vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) );     \
+     }
+ #define SET_EXTRA( keyName, metaName )                                                   \
+-    if( tag->itemListMap().contains(keyName) )                                  \
+    if( tag->itemMap().contains(keyName) )                                  \
+     {                                                                                \
+-        list = tag->itemListMap()[keyName];                                     \
+        list = tag->itemMap()[keyName];                                     \
+         vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+     }
+ 
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+ 
+-    if( tag->itemListMap().contains("covr") )
+    if( tag->itemMap().contains("covr") )
+     {
+-        MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
+        MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+         const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+ 
+         msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+         if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+             WriteMetaToId3v2( riff_aiff->tag(), p_item );
+         else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+-            WriteMetaToId3v2( riff_wav->tag(), p_item );
+            WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+     }
+     else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+     {
+-- 
+2.45.2

--- a/media-video/vlc/vlc-3.0.21.recipe
+++ b/media-video/vlc/vlc-3.0.21.recipe
@@ -5,7 +5,7 @@ VCDs, and various streaming protocols."
 HOMEPAGE="https://www.videolan.org/vlc/"
 COPYRIGHT="1998-2024 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="24dbbe1d7dfaeea0994d5def0bbde200177347136dbfe573f5b6a4cee25afbb0"
@@ -21,8 +21,10 @@ SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
 	vlc$secondaryArchSuffix = $portVersion
-	app:VLC$secondaryArchSuffix = $portVersion
-	cmd:vlc = $portVersion
+	app:VLC = $portVersion
+	cmd:vlc$secondaryArchSuffix = $portVersion
+	lib:libvlc$secondaryArchSuffix = 5.6.1 compat >= 5
+	lib:libvlccore$secondaryArchSuffix = 9.0.1 compat >= 9
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -83,6 +85,16 @@ REQUIRES="
 	lib:libz$secondaryArchSuffix
 	"

+
+PROVIDES_devel="
+	vlc${secondaryArchSuffix}_devel = $portVersion
+	devel:libvlc$secondaryArchSuffix = 5.6.1 compat >= 5
+	devel:libvlccore$secondaryArchSuffix = 9.0.1 compat >= 9
+	"
+REQUIRES_devel="
+	vlc$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	live555${secondaryArchSuffix}_devel
@@ -127,7 +139,7 @@ BUILD_REQUIRES="
 	devel:libspeexdsp$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix >= 3
 	devel:libswscale$secondaryArchSuffix >= 7
-	devel:libtag$secondaryArchSuffix
+	devel:libtag$secondaryArchSuffix >= 2.0.0
 	devel:libtheora$secondaryArchSuffix
 	devel:libtwolame$secondaryArchSuffix
 	devel:libupnp$secondaryArchSuffix
@@ -163,16 +175,12 @@ BUILD()
 	export CXXFLAGS="-lgnu -lnetwork"

 	runConfigure ./configure \
-		--prefix=$appsDir/VLC \
-		--bindir=$appsDir/VLC \
-		--libdir=$appsDir/VLC/lib \
-		--datarootdir=$appsDir/VLC/data \
-		--datadir=$appsDir/VLC/data \
 		--disable-rpath \
 		--with-default-font=`finddir B_SYSTEM_FONTS_DIRECTORY`/ttfonts/NotoMono-Regular.ttf \
 		--with-default-font-family=Sans \
 		--with-default-monospace-font-family=Monospace \
 		--disable-dependency-tracking \
+		--disable-static \
 		--enable-run-as-root \
 		--disable-update-check \
 		--enable-fast-install \
@@ -188,16 +196,13 @@ INSTALL()
 {
 	make install-strip

-	rm -rf $appsDir/VLC/data/{applications,icons,kde4}
-	rm -rf $appsDir/VLC/{cvlc,qvlc,rvlc,vlc-wrapper}
-	rm -rf $developDir $manDir $docDir $appsDir/VLC/lib/pkgconfig
-	find $appsDir/VLC/lib -name '*.a' -delete
-	find $appsDir/VLC/lib -name '*.la' -delete
+	rm -rf $dataDir/{applications,icons,kde4}
+	rm -rf $binDir/{cvlc,qvlc,rvlc,vlc-wrapper}
+	find $libDir -name '*.la' -delete

-	cp "haiku/VLC media player" $appsDir/VLC
-	mv $appsDir/VLC/vlc $appsDir/VLC/VLC
-	mkdir -p $prefix/bin
-	ln -s $appsDir/VLC/VLC $prefix/bin/vlc
+	mkdir -p $appsDir
+	cp "haiku/VLC media player" $appsDir
+	cp $binDir/vlc $appsDir/VLC

 	local APP_SIGNATURE="application/x-vnd.vlc"
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
@@ -212,7 +217,7 @@ INSTALL()
 		-e "s|@LONG_INFO@|$LONG_INFO|" \
 		$portDir/additional-files/vlc.rdef.in > vlc.rdef

-	addResourcesToBinaries vlc.rdef $appsDir/VLC/VLC
+	addResourcesToBinaries vlc.rdef $appsDir/VLC

 	local APP_SIGNATURE="application/x-vnd.vlc-launcher"
 	sed \
@@ -223,7 +228,20 @@ INSTALL()
 		-e "s|@LONG_INFO@|$LONG_INFO|" \
 		$portDir/additional-files/vlc_launcher.rdef.in > vlc_launcher.rdef

-	addResourcesToBinaries vlc_launcher.rdef "$appsDir/VLC/VLC media player"
+	addResourcesToBinaries vlc_launcher.rdef "$appsDir/VLC media player"

-	addAppDeskbarSymlink $appsDir/VLC/VLC "VLC media player"
+	addAppDeskbarSymlink $appsDir/VLC "VLC media player"
+
+	prepareInstalledDevelLibs \
+		libvlc \
+		libvlccore
+	fixPkgconfig
+
+	packageEntries devel \
+		$developDir
+}
+
+TEST()
+{
+	make check
 }