qmplay2: fix static build for modules and recipe cleanup

media-video/qmplay2/patches/qmplay2_x86-15.05.30.patchset

@@ -1,4 +1,4 @@
-From 5b67bd20407c7db4b30a7a884f85b86b344a5ccf Mon Sep 17 00:00:00 2001
+From aae8583f72a5ae94451426d0888fda79c40906df Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sun, 31 May 2015 20:21:58 +1000
 Subject: Add Haiku support
@@ -992,7 +992,7 @@ index bc0ac7c..a7cc9d2 100644
 2.2.2
 
 
-From 162785260d5f12b44fbf7f02193da24825703b32 Mon Sep 17 00:00:00 2001
+From 9806e524e5618a6d07286fdf991321a7690d6bd1 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sun, 31 May 2015 20:42:24 +1000
 Subject: Fix Extensions module path
@@ -1014,7 +1014,7 @@ index fba08a3..33457bd 100644
 2.2.2
 
 
-From 952ab937ccf18c0847f850a4d1f5d165bf3a09eb Mon Sep 17 00:00:00 2001
+From 4292d4c538bbc94436a36dc031e3fb379e9ac219 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sun, 31 May 2015 21:26:57 +1000
 Subject: Add haiku resources
@@ -1072,7 +1072,7 @@ index 0000000..c23d039
 2.2.2
 
 
-From 3fd43152c1d6263e1012946437bf2e3821d86895 Mon Sep 17 00:00:00 2001
+From a9ecc01978f198ad496868ab283f9a97f9bba986 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Mon, 1 Jun 2015 20:19:40 +1000
 Subject: Optimize mediakit writer
@@ -1116,7 +1116,7 @@ index 7926fb3..ca7ad89 100644
 2.2.2
 
 
-From 2ce99ff08cb5b6fc76b1edbc40c5be4f017fea9e Mon Sep 17 00:00:00 2001
+From 6a88fc2723e21f6dce0f20637f29e776fff1696a Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Mon, 1 Jun 2015 20:24:04 +1000
 Subject: Fix flags
@@ -1137,7 +1137,7 @@ index c23d039..897f42c 100644
 2.2.2
 
 
-From fc2a08b97fe2f3850ff05328ef79b985bacafd50 Mon Sep 17 00:00:00 2001
+From 78d5b833eda42e452d9c7aec5735ef7ddbaab053 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Mon, 1 Jun 2015 20:33:23 +1000
 Subject: Fix flags again
@@ -1158,7 +1158,7 @@ index 897f42c..f41469d 100644
 2.2.2
 
 
-From 06773dd51deaa33417c9e710353e98bc346b7556 Mon Sep 17 00:00:00 2001
+From 34ed2a733d44e8e18d05d553a814a3d393a451cf Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Mon, 1 Jun 2015 22:58:04 +1000
 Subject: Change default settings for haiku
@@ -1198,7 +1198,7 @@ index 506f05d..71aad7f 100644
 2.2.2
 
 
-From ed449b3b145263d48d131ad73c6d56901260ea97 Mon Sep 17 00:00:00 2001
+From 49bb67b67e05a360fafdb938b5e1f66bb07c30a2 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Tue, 2 Jun 2015 20:07:18 +1000
 Subject: Add haiku styled icons
@@ -1776,3 +1776,47 @@ index 0000000..f038534
 -- 
 2.2.2
 
+
+From 5d3142148cd6e439bd32d148e70bb41bc1065e69 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Wed, 3 Jun 2015 13:21:15 +1000
+Subject: Fix ffmpeg static link for Visualizations and AudioFilters modules
+
+
+diff --git a/src/modules/AudioFilters/AudioFilters.pro b/src/modules/AudioFilters/AudioFilters.pro
+index 01d083c..0e02939 100644
+--- a/src/modules/AudioFilters/AudioFilters.pro
++++ b/src/modules/AudioFilters/AudioFilters.pro
+@@ -11,7 +11,11 @@ win32: QMAKE_LIBDIR += ../../../app
+ else: QMAKE_LIBDIR += ../../../app/lib
+ LIBS += -lqmplay2
+ win32: LIBS += -lavcodec -lavutil
+-else {
++haiku {
++	LIBS += /boot/system/develop/lib/x86/libavcodec.a
++	LIBS += /boot/system/develop/lib/x86/libavutil.a
++	LIBS += -lspeex -ltheora -ltheoradec -lvorbis -lvorbisfile -lvorbisenc -lvpx
++} else {
+ 	CONFIG += link_pkgconfig
+ 	PKGCONFIG += libavcodec libavutil
+ }
+diff --git a/src/modules/Visualizations/Visualizations.pro b/src/modules/Visualizations/Visualizations.pro
+index 7d3b946..021bc40 100644
+--- a/src/modules/Visualizations/Visualizations.pro
++++ b/src/modules/Visualizations/Visualizations.pro
+@@ -11,7 +11,11 @@ win32: QMAKE_LIBDIR += ../../../app
+ else: QMAKE_LIBDIR += ../../../app/lib
+ LIBS += -lqmplay2
+ win32: LIBS += -lavcodec -lavutil
+-else {
++haiku {
++	LIBS += /boot/system/develop/lib/x86/libavcodec.a
++	LIBS += /boot/system/develop/lib/x86/libavutil.a
++	LIBS += -lspeex -ltheora -ltheoradec -lvorbis -lvorbisfile -lvorbisenc -lvpx
++} else {
+ 	CONFIG += link_pkgconfig
+ 	PKGCONFIG += libavcodec libavutil
+ }
+-- 
+2.2.2
+

media-video/qmplay2/qmplay2-15.05.30.recipe

@@ -1,4 +1,4 @@
-SUMMARY="QMPlay2 is a video and audio player which can play most formats and codecs"
+SUMMARY="A video and audio player which can play most formats and codecs"
 DESCRIPTION="QMPlay2 is a video and audio player. It can play all formats \
 supported by ffmpeg, libmodplug (including J2B and SFX). It also supports \
 Audio CD, raw files and Rayman 2 music. It contains YouTube and Prostoplee\
@@ -6,7 +6,7 @@ r browser."
 HOMEPAGE="http://zaps166.sourceforge.net"
 SRC_URI="git+https://github.com/zaps166/QMPlay2.git#43fd55b4e648d52f11de8f9c9c303f6149867f17"
 
-REVISION="1"
+REVISION="2"
 LICENSE="GNU GPL v3"
 COPYRIGHT="2010-2015 Błażej Szczygieł"
 
@@ -56,16 +56,6 @@ BUILD_PREREQUIRES="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	libqt4${secondaryArchSuffix}_devel >= 4.8.0
-	lib:libgcc_s$secondaryArchSuffix
-	lib:libavutil$secondaryArchSuffix >= 54
-	lib:libavcodec$secondaryArchSuffix >= 56
-	lib:libavformat$secondaryArchSuffix >= 56
-	lib:libavdevice$secondaryArchSuffix >= 56
-	lib:libavfilter$secondaryArchSuffix >= 5
-	lib:libavresample$secondaryArchSuffix >= 2
-	lib:libswscale$secondaryArchSuffix >= 3
-	lib:libswresample$secondaryArchSuffix >= 1.1
-	lib:libpostproc$secondaryArchSuffix >= 53
 	devel:libavutil$secondaryArchSuffix >= 54
 	devel:libavcodec$secondaryArchSuffix >= 56
 	devel:libavformat$secondaryArchSuffix >= 56
@@ -107,6 +97,6 @@ INSTALL()
 	cp -R app/modules $appsDir/QMPlay2
 	cp -R app/share/qmplay2/lang $appsDir/QMPlay2
 	
-	addResourcesToBinaries ./haiku/QMPlay2.rdef $appsDir/QMPlay2/QMPlay2
-	addAppDeskbarSymlink $appsDir/QMPlay2/QMPlay2 "QMPlay2"
+	addResourcesToBinaries haiku/QMPlay2.rdef $appsDir/QMPlay2/QMPlay2
+	addAppDeskbarSymlink $appsDir/QMPlay2/QMPlay2 QMPlay2
 }