VLC: bump version

* add native sound module
* add native video module
* many fixes for UI
* add launcher for Tracker refs

media-video/vlc/additional-files/vlc.rdef.in

@@ -1,5 +1,5 @@
 
-resource app_flags B_SINGLE_LAUNCH | B_ARGV_ONLY;
+resource app_flags B_MULTIPLE_LAUNCH;
 
 resource app_version {
 	major  = @MAJOR@,
@@ -15,12 +15,6 @@ resource app_version {
 
 resource app_signature "@APP_SIGNATURE@";
 
-resource file_types message {
-	"types" = "application/x-asf",
-	"types" = "audio",
-	"types" = "video"
-};
-
 resource vector_icon {
 	$"6E6369660A0500020006023B69C90000000000003B23A04AC3EF4AE6A9007C45"
 	$"03FFD3893303F2A541020006033D79BF0000000000003D324D49E2A74A24F500"

media-video/vlc/additional-files/vlc_launcher.rdef.in

@@ -0,0 +1,47 @@
+
+resource app_flags B_MULTIPLE_LAUNCH | B_BACKGROUND_APP;
+
+resource app_version {
+	major  = @MAJOR@,
+	middle = @MIDDLE@,
+	minor  = @MINOR@,
+
+	variety = B_APPV_FINAL,
+	internal = 0,
+
+	short_info = "VideoLAN Client",
+	long_info = "@LONG_INFO@"
+};
+
+resource app_signature "@APP_SIGNATURE@";
+
+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"
+};

media-video/vlc/vlc-3.0.11.1.recipe

@@ -3,86 +3,68 @@ 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-2017 VideoLAN"
+COPYRIGHT="1998-2020 VideoLAN"
 LICENSE="GNU GPL v2"
-REVISION="7"
+REVISION="1"
 SOURCE_URI="https://download.videolan.org/pub/videolan/vlc/$portVersion/vlc-$portVersion.tar.xz"
-CHECKSUM_SHA256="9bf046848fb56d93518881b39099b8288ee005d5ba0ddf705b6f6643b8d562ec"
+CHECKSUM_SHA256="189311d28aa814f106a7b3645211ac52c0b3e2b9f4b348de2f63bab3218086b8"
 PATCHES="vlc-$portVersion.patchset"
-ADDITIONAL_FILES="vlc.rdef.in"
+ADDITIONAL_FILES="
+	vlc.rdef.in
+	vlc_launcher.rdef.in
+	haikuicons.zip
+	"
 
-ARCHITECTURES="!x86_gcc2 ?x86_64"
-SECONDARY_ARCHITECTURES="?x86"
+ARCHITECTURES="!x86_gcc2 x86_64"
+SECONDARY_ARCHITECTURES="!x86"
 
 PROVIDES="
 	vlc$secondaryArchSuffix = $portVersion
-	cmd:cvlc$secondaryArchSuffix
-	cmd:nvlc$secondaryArchSuffix
-	cmd:qvlc$secondaryArchSuffix
-	cmd:rvlc$secondaryArchSuffix
-	cmd:vlc$secondaryArchSuffix
-	cmd:vlc_wrapper$secondaryArchSuffix
-	lib:libvlc$secondaryArchSuffix
-	lib:libvlccore$secondaryArchSuffix
+	app:VLC$secondaryArchSuffix = $portVersion
+	cmd:vlc = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:liba52$secondaryArchSuffix
-	lib:libass$secondaryArchSuffix
 	lib:libavcodec$secondaryArchSuffix
 	lib:libavformat$secondaryArchSuffix
 	lib:libavutil$secondaryArchSuffix
 	lib:libbluray$secondaryArchSuffix
-	lib:libcaca$secondaryArchSuffix
+	lib:libcddb$secondaryArchSuffix
 	lib:libdca$secondaryArchSuffix
 	lib:libdvbpsi$secondaryArchSuffix
+	lib:libdvdcss$secondaryArchSuffix
 	lib:libdvdnav$secondaryArchSuffix
 	lib:libdvdread$secondaryArchSuffix
 	lib:libebml$secondaryArchSuffix
+	lib:libenca$secondaryArchSuffix
 	lib:libfaad$secondaryArchSuffix
 	lib:libFLAC$secondaryArchSuffix
-	lib:libfluidsynth$secondaryArchSuffix
 	lib:libfontconfig$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
-	lib:libfribidi$secondaryArchSuffix
-	lib:libgcrypt$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
-#	lib:libgnutls$secondaryArchSuffix
-	lib:libgpg_error$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
-	lib:libidn$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix	
-	lib:libixml$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
-	lib:liblua$secondaryArchSuffix
 	lib:libmad$secondaryArchSuffix
 	lib:libmatroska$secondaryArchSuffix
 	lib:libmodplug$secondaryArchSuffix
 	lib:libmpcdec$secondaryArchSuffix
 	lib:libmpeg2$secondaryArchSuffix
-	lib:libmtp$secondaryArchSuffix
-	lib:libncursesw$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
 	lib:libopus$secondaryArchSuffix
 	lib:libpng16$secondaryArchSuffix
-	lib:libpostproc$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
 	lib:libQt5Gui$secondaryArchSuffix
 	lib:libQt5Widgets$secondaryArchSuffix
 	lib:libsamplerate$secondaryArchSuffix
-#	lib:libschroedinger_1.0$secondaryArchSuffix
-	lib:libSDL_1.2$secondaryArchSuffix
-	lib:libSDL_image_1.2$secondaryArchSuffix
-#	lib:libshout$secondaryArchSuffix
-	lib:libsmbclient$secondaryArchSuffix
 	lib:libspeex$secondaryArchSuffix
-	lib:libssh2$secondaryArchSuffix
 	lib:libswscale$secondaryArchSuffix
 	lib:libtag$secondaryArchSuffix
 	lib:libtheoradec$secondaryArchSuffix
 	lib:libtheoraenc$secondaryArchSuffix
 	lib:libtwolame$secondaryArchSuffix
-	lib:libupnp$secondaryArchSuffix
+#	lib:libupnp$secondaryArchSuffix					# dedlock when scan upnp devices
 	lib:libvorbis$secondaryArchSuffix
 	lib:libvorbisenc$secondaryArchSuffix
 	lib:libvpx$secondaryArchSuffix
@@ -92,24 +74,13 @@ REQUIRES="
 	lib:libz$secondaryArchSuffix
 	"
 
-PROVIDES_devel="
-	vlc${secondaryArchSuffix}_devel = $portVersion
-	devel:libvlc$secondaryArchSuffix = 5.5.0 compat >= 5
-	devel:libvlccore$secondaryArchSuffix = 8.8.0 compat >= 8
-	"
-REQUIRES_devel="
-	haiku${secondaryArchSuffix}_devel
-	"
-
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:liba52$secondaryArchSuffix
-	devel:libass$secondaryArchSuffix # crashes vlc-cache-gen
-	devel:libavcodec$secondaryArchSuffix >= 58
-	devel:libavformat$secondaryArchSuffix >= 58
-	devel:libavutil$secondaryArchSuffix >= 56
+	a52dec${secondaryArchSuffix}_devel
+	devel:libavcodec$secondaryArchSuffix
+	devel:libavformat$secondaryArchSuffix
+	devel:libavutil$secondaryArchSuffix
 	devel:libbluray$secondaryArchSuffix
-	devel:libcaca$secondaryArchSuffix
 	devel:libcddb$secondaryArchSuffix
 	devel:libdca$secondaryArchSuffix
 	devel:libdvbpsi$secondaryArchSuffix
@@ -120,99 +91,93 @@ BUILD_REQUIRES="
 	devel:libenca$secondaryArchSuffix
 	devel:libfaad$secondaryArchSuffix
 	devel:libflac$secondaryArchSuffix
-	devel:libfluidsynth$secondaryArchSuffix # crashes vlc-cache-gen
 	devel:libfontconfig$secondaryArchSuffix
 	devel:libfreetype$secondaryArchSuffix
-	devel:libfribidi$secondaryArchSuffix
-	devel:libgcrypt$secondaryArchSuffix
 	devel:libgl$secondaryArchSuffix
-#	devel:libgnutls$secondaryArchSuffix # crashes vlc on start
-	devel:libgpg_error$secondaryArchSuffix
-	devel:libharfbuzz$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
-	devel:libidn$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
-	devel:liblua52$secondaryArchSuffix
 	devel:libmad$secondaryArchSuffix
 	devel:libmatroska$secondaryArchSuffix
 	devel:libmodplug$secondaryArchSuffix
 	devel:libmpcdec$secondaryArchSuffix
 	devel:libmpeg2$secondaryArchSuffix
-	devel:libmtp$secondaryArchSuffix
 	devel:libogg$secondaryArchSuffix
 	devel:libopus$secondaryArchSuffix
-	devel:libpng$secondaryArchSuffix
-	devel:libpthread_stubs$secondaryArchSuffix
-	devel:libQt5Core$secondaryArchSuffix >= 5.7
-	devel:libQt5Gui$secondaryArchSuffix >= 5.7
-	devel:libQt5Widgets$secondaryArchSuffix >= 5.7
+	devel:libpng16$secondaryArchSuffix
+	devel:libQt5Core$secondaryArchSuffix
 	devel:libsamplerate$secondaryArchSuffix
-#	devel:libschroedinger_1.0$secondaryArchSuffix # fix libschroedinger.pc
-	devel:libsdl_1.2$secondaryArchSuffix
-	devel:libsdl_image_1.2$secondaryArchSuffix
-#	devel:libshout$secondaryArchSuffix # crashes vlc on quit. Haiku #8600
-	devel:libsmbclient$secondaryArchSuffix
 	devel:libspeex$secondaryArchSuffix
-	devel:libssh2$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix
-	devel:libswscale$secondaryArchSuffix >= 5
+	devel:libswscale$secondaryArchSuffix
 	devel:libtag$secondaryArchSuffix
 	devel:libtheora$secondaryArchSuffix
 	devel:libtwolame$secondaryArchSuffix
-	devel:libupnp$secondaryArchSuffix
+#	devel:libupnp$secondaryArchSuffix				# dedlock when scan upnp devices
 	devel:libvorbis$secondaryArchSuffix
 	devel:libvpx$secondaryArchSuffix
 	devel:libx264$secondaryArchSuffix
 	devel:libx265$secondaryArchSuffix
-	devel:libxcb$secondaryArchSuffix
 	devel:libxml2$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
-	devel:live555$secondaryArchSuffix
 	"
+
 BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoreconf
-	cmd:g++$secondaryArchSuffix
+	cmd:gcc$secondaryArchSuffix
 	cmd:gettext$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:xargs
+	cmd:yacc
 	"
 
-PATCH()
-{
-	# Remove unnecessary warnings about unimplemented pragmas on gcc for now.
-	# config.h:798: warning: ignoring #pragma STDC FENV_ACCESS [-Wunknown-pragmas]
-	# config.h:799: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas]
-	# doesn't work for some reason
-	sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
-
-	# _FORTIFY_SOURCE is set to 2 by default on Haiku, remove redefine warnings.
-	sed -i '/_FORTIFY_SOURCE.*, 2,/d' configure.ac || die
-}
-
 BUILD()
 {
+	unzip -o $portDir/additional-files/haikuicons.zip -d $sourceDir
+
 	autoreconf
-	runConfigure ./configure --disable-rpath \
+
+	export BUILDCC=gcc
+	export CFLAGS="-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-update-check \
-		--disable-dependency-tracking --enable-run-as-root \
-		--disable-update-check --enable-fast-install --disable-dependency-tracking
-#		--bindir=$appsDir/VLC --libdir=$appsDir/VLC/plugins
+		--with-default-monospace-font-family=Monospace \
+		--disable-dependency-tracking \
+		--enable-run-as-root \
+		--disable-update-check \
+		--enable-fast-install \
+		--disable-lua
+
 	make $jobArgs
+	
+	cd haiku
+	gcc VLCLauncher.cpp -lbe -o "VLC media player"
 }
 
 INSTALL()
 {
 	make install-strip
 
-	rm -rf $dataDir/{applications,icons,kde4,vlc}
+	rm -rf $appsDir/VLC/data/{applications,icons,kde4,vlc}
+	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
 
-	# Punt useless libtool's .la files
-	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
 
 	local APP_SIGNATURE="application/x-vnd.vlc"
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
@@ -227,21 +192,18 @@ INSTALL()
 		-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"
+	addResourcesToBinaries vlc.rdef $appsDir/VLC/VLC
 
-	fixPkgconfig
-	mkdir -p $prefix/develop/lib${secondaryArchSuffix/_//}
-	# TODO: fix libvlc.pc location
-	# mv -f $prefix/lib/pkgconfig $prefix/develop/lib${secondaryArchSuffix/_//}/
+	local APP_SIGNATURE="application/x-vnd.vlc-launcher"
+	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_launcher.rdef.in > vlc_launcher.rdef
 
-	prepareInstalledDevelLibs \
-		libvlc libvlccore
-	packageEntries devel \
-		$developDir
-}
-
-TEST()
-{
-	make check
+	addResourcesToBinaries vlc_launcher.rdef "$appsDir/VLC/VLC media player"
+
+	addAppDeskbarSymlink $appsDir/VLC/VLC "VLC media player"
 }