vlc: use additional-files and fix duplicate vlc.rdef in patch. (#635)

* Remove the duplicate vlc.rdef that was embedded in the patchset
  for vlc-0.8.6i and, instead, make it use the same vlc.rdef that
  vlc-2.2.1 already uses and which is in additional-files.
* Tweak vlc.rdef to make it usable with any version of vlc.
* Add TEST() with "make check" (to both 0.8.6i and 2.2.1).
* Fix the recipe of VLC 2.2.1 to make it build on x86 2nd arch.
* Force VLC 2.2.1 to use lib:libswscale from ffmpeg2. BTW,
  it seems this version of VLC cannot compile against ffmpeg >= 3.
* Comment out the lib:libdevice in REQUIRES because the haiku hpkg is
  missing a PROVIDES for it.
* VLC 0.8.6i was previously using libdvbpsi 1.2.0 but the compilation
  now fails for some reason (unknown to me). The compilation also
  fails when building against libdvbpsi 1.3.0, so drop support for it
  in VLC 0.8.6i. VLC 2.2.1 on x86 secondary arch builds fine with any
  of the mentioned releases of libdvbpsi, though.

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

@@ -2,9 +2,9 @@
 resource app_flags B_SINGLE_LAUNCH | B_ARGV_ONLY;
 
 resource app_version {
-       major  = 2,
+       major  = @MAJOR@,
-       middle = 2,
+       middle = @MIDDLE@,
-       minor  = 1,
+       minor  = @MINOR@,
 
        variety = B_APPV_FINAL,
        internal = 0,
@@ -13,7 +13,7 @@ resource app_version {
        long_info = "A multi-platform multimedia player."
 };
 
-resource app_signature "application/x-vnd.vlc";
+resource app_signature "@APP_SIGNATURE@";
 
 resource file_types message {
        "types" = "application/x-asf",

media-video/vlc/patches/vlc-0.8.6i.patchset

@@ -1506,132 +1506,6 @@ index dc3d686..b0bce86 100644
 2.2.2
 
 
-From 6dcfd6241bdb0b498f86d86e37e35ea34f8ef0ab Mon Sep 17 00:00:00 2001
-From: Adrien Destugues <pulkomandy@gmail.com>
-Date: Sat, 25 Apr 2015 17:15:11 +0200
-Subject: Add rdef file.
-
-
-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"
-+};
--- 
-2.2.2
-
-
-From 45454c04e7af47bb18a18fdd4f3006e8a95b4b43 Mon Sep 17 00:00:00 2001
-From: Adrien Destugues <pulkomandy@gmail.com>
-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 <pulkomandy@gmail.com>
 Date: Fri, 19 Sep 2014 11:05:54 +0200

media-video/vlc/vlc-0.8.6i.recipe

@@ -3,41 +3,51 @@ 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 organization"
+COPYRIGHT="1998-2008 VideoLAN"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://download.videolan.org/pub/vlc/$portVersion/vlc-$portVersion.tar.gz"
 CHECKSUM_SHA256="e99b3b49efd8cae8cf210ca69a5c81ceeac3b2e7d2b1e79df84c9abee4aa8426"
 PATCHES="vlc-$portVersion.patchset"
+ADDITIONAL_FILES="vlc.rdef"
 
 ARCHITECTURES="x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	vlc$secondaryArchSuffix = $portVersion
-	cmd:vlc
+	cmd:vlc$secondaryArchSuffix
-	cmd:vlc_config
+	cmd:vlc_config$secondaryArchSuffix
 	"
 REQUIRES="
-	haiku
+	haiku$secondaryArchSuffix
-	lib:libintl
+	lib:liba52$secondaryArchSuffix
-	lib:libiconv
+	lib:libavcodec$secondaryArchSuffix == 53.61.100
+	lib:libdvdcss$secondaryArchSuffix
+#	lib:libdvbpsi$secondaryArchSuffix >= 9
+	lib:libintl$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libgpg_error$secondaryArchSuffix
+	lib:libgnutls$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
-	vlc_devel = $portVersion
+	vlc${secondaryArchSuffix}_devel = $portVersion
-	devel:libvlc
+	devel:libvlc$secondaryArchSuffix
-	devel:libbeos
+	devel:libbeos$secondaryArchSuffix
-	devel:libi420_rgb_mmx
+	devel:libi420_rgb_mmx$secondaryArchSuffix
-	devel:libi420_ymga_mmx
+	devel:libi420_ymga_mmx$secondaryArchSuffix
-	devel:libi420_yuy2_mmx
+	devel:libi420_yuy2_mmx$secondaryArchSuffix
-	devel:libi422_yuy2_mmx
+	devel:libi422_yuy2_mmx$secondaryArchSuffix
-	devel:libmemcpy3dn
+	devel:libmemcpy3dn$secondaryArchSuffix
-	devel:libmemcpymmx
+	devel:libmemcpymmx$secondaryArchSuffix
-	devel:libmemcpymmxext
+	devel:libmemcpymmxext$secondaryArchSuffix
 	"
 REQUIRES_devel="
 	vlc == $portVersion base
+#	devel:libdvbpsi$secondaryArchSuffix >= 9
+	devel:libintl$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
@@ -48,7 +58,7 @@ BUILD_REQUIRES="
 	devel:libcddb$secondaryArchSuffix
 	devel:libcdio$secondaryArchSuffix
 	devel:libdca$secondaryArchSuffix
-	devel:libdvbpsi$secondaryArchSuffix
+#	devel:libdvbpsi$secondaryArchSuffix >= 9
 	devel:libdvdcss$secondaryArchSuffix
 	devel:libdvdnav$secondaryArchSuffix
 	devel:libdvdread$secondaryArchSuffix
@@ -93,7 +103,7 @@ BUILD_PREREQUIRES="
 	cmd:bison
 	cmd:gcc$secondaryArchSuffix
 	cmd:ar$secondaryArchSuffix
-	cmd:libtoolize
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:sed
@@ -120,8 +130,24 @@ INSTALL()
 		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:]'`"
+	sed \
+		-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
+		-e "s|@MAJOR@|$MAJOR|" \
+		-e "s|@MIDDLE@|$MIDDLE|" \
+		-e "s|@MINOR@|$MINOR|" \
+		$portDir/additional-files/vlc.rdef > vlc.rdef
+
 	addResourcesToBinaries vlc.rdef $binDir/vlc
 	addAppDeskbarSymlink $binDir/vlc "VLC media player"
 
 	packageEntries devel $developDir
 }
+
+TEST()
+{
+	make check
+}

media-video/vlc/vlc-2.2.1.recipe

@@ -3,7 +3,7 @@ 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-2015"
+COPYRIGHT="1998-2015 VideoLAN"
 LICENSE="GNU GPL v2"
 REVISION="2"
 SOURCE_URI="https://download.videolan.org/pub/videolan/vlc/$portVersion/vlc-$portVersion.tar.xz"
@@ -11,7 +11,7 @@ CHECKSUM_SHA256="543d9d7e378ec0fa1ee2e7f7f5acf8c456c7d0ecc32037171523197ef3cf1fc
 PATCHES="vlc-$portVersion.patch"
 ADDITIONAL_FILES="vlc.rdef"
 
-ARCHITECTURES="!x86_gcc2 x86"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
@@ -37,7 +37,7 @@ REQUIRES="
 	lib:libcaca$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
 	lib:libdca$secondaryArchSuffix
-	lib:libdevice$secondaryArchSuffix
+#	lib:libdevice$secondaryArchSuffix
 	lib:libdvbpsi$secondaryArchSuffix
 	lib:libdvdnav$secondaryArchSuffix
 	lib:libdvdread$secondaryArchSuffix
@@ -78,7 +78,7 @@ REQUIRES="
 	lib:libspeexdsp$secondaryArchSuffix
 	lib:libssh2$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
-	lib:libswscale$secondaryArchSuffix
+	lib:libswscale$secondaryArchSuffix >= 3
 	lib:libtag$secondaryArchSuffix
 	lib:libtheoradec$secondaryArchSuffix
 	lib:libtheoraenc$secondaryArchSuffix
@@ -140,7 +140,7 @@ BUILD_REQUIRES="
 	devel:libspeex$secondaryArchSuffix
 	devel:libssh2$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix
-	devel:libswscale$secondaryArchSuffix
+	devel:libswscale$secondaryArchSuffix >= 3
 	devel:libtag$secondaryArchSuffix
 	devel:libtheora$secondaryArchSuffix
 	devel:libtwolame$secondaryArchSuffix
@@ -158,7 +158,7 @@ BUILD_PREREQUIRES="
 	cmd:autoreconf
 	cmd:g++${secondaryArchSuffix}
 	cmd:gettext$secondaryArchSuffix
-	cmd:libtoolize
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:xargs
@@ -186,7 +186,18 @@ INSTALL()
 	# Punt useless libtool's .la files
 	find $libDir -name '*.la' -delete
 
-	addResourcesToBinaries $portDir/additional-files/vlc.rdef $binDir/vlc
+	local APP_SIGNATURE="application/x-vnd.vlc"
+	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
+	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
+	local MINOR="`echo "$portVersion" | cut -d. -f3`"
+	sed \
+		-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
+		-e "s|@MAJOR@|$MAJOR|" \
+		-e "s|@MIDDLE@|$MIDDLE|" \
+		-e "s|@MINOR@|$MINOR|" \
+		$portDir/additional-files/vlc.rdef > vlc.rdef
+
+	addResourcesToBinaries vlc.rdef $binDir/vlc
 	addAppDeskbarSymlink $binDir/vlc "VLC media player"
 
 #	prepareInstalledDevelLibs libvlc libvlccore
@@ -194,3 +205,8 @@ INSTALL()
 #	packageEntries devel \
 #		$developDir
 }
+
+TEST()
+{
+	make check
+}