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/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_config
+	cmd:vlc$secondaryArchSuffix
+	cmd:vlc_config$secondaryArchSuffix
 	"
 REQUIRES="
-	haiku
-	lib:libintl
-	lib:libiconv
+	haiku$secondaryArchSuffix
+	lib:liba52$secondaryArchSuffix
+	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
-	devel:libvlc
-	devel:libbeos
-	devel:libi420_rgb_mmx
-	devel:libi420_ymga_mmx
-	devel:libi420_yuy2_mmx
-	devel:libi422_yuy2_mmx
-	devel:libmemcpy3dn
-	devel:libmemcpymmx
-	devel:libmemcpymmxext
+	vlc${secondaryArchSuffix}_devel = $portVersion
+	devel:libvlc$secondaryArchSuffix
+	devel:libbeos$secondaryArchSuffix
+	devel:libi420_rgb_mmx$secondaryArchSuffix
+	devel:libi420_ymga_mmx$secondaryArchSuffix
+	devel:libi420_yuy2_mmx$secondaryArchSuffix
+	devel:libi422_yuy2_mmx$secondaryArchSuffix
+	devel:libmemcpy3dn$secondaryArchSuffix
+	devel:libmemcpymmx$secondaryArchSuffix
+	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
+}