update debian scripts

configure

@@ -2,6 +2,9 @@
 
 SED=sed
 
+#special case for build in ubuntu using bomi ppa
+PKG_CONFIG_PATH=/opt/ffmpeg-bomi/lib/pkgconfig:${PKG_CONFIG_PATH}
+
 export PKG_CONFIG_PATH="`pwd`/build/lib/pkgconfig:$PKG_CONFIG_PATH"
 
 arguments="$@"

debian/base/control

@@ -8,7 +8,7 @@ Build-Depends: clang (>= 3.3), debhelper (>= 7), pkg-config
  , libqt5x11extras5-dev, python, libicu-dev, libbluray-dev
  , yasm, zlib1g-dev, libx11-dev, libdvdread-dev, libdvdnav-dev
  , libcdio-dev, libcdio-paranoia-dev, libcdio-cdda-dev
- , libasound2-dev, libva-dev, libvdpau-dev
+ , libasound2-dev, libva-dev, libvdpau-dev, libchardet
  , libmpg123-dev, libbz2-dev, libass-dev, libjack-dev
  , libpulse-dev, libxcb-icccm4-dev, libgnutls-dev
  , libxcb-util0-dev, libxcb-randr0-dev, libxcb-screensaver0-dev

debian/base/rules

@@ -19,8 +19,6 @@ build-stamp:
 	dh_testdir
 
 	# Add here commands to compile the package.
-	./build-libchardet
-	./build-ffmpeg
 	./configure --prefix=/usr --cc=clang \
 		--actiondir=/usr/share/kde4/apps/solid/actions
 	make
@@ -35,8 +33,6 @@ clean:
 
 	# Add here commands to clean up after the build process.
 	[ ! -f Makefile ] || make clean
-	cd src/libchardet*; [ ! -f Makefile ] || make distclean
-	cd src/ffmpeg; [ ! -f config.h ] || make distclean
 	cd src/mpv; ./waf distclean
 	rm -rf build
 

debian/build.sh

@@ -20,15 +20,12 @@ if ! [ -e bomi-$ver.tar.gz ]; then
   mv v$ver.tar.gz bomi-$ver.tar.gz
   tar xvfz bomi-$ver.tar.gz
   cd bomi-$ver
-  ./download-ffmpeg
-  ./download-libchardet
   cd src/mpv
   ./bootstrap.py
-
-    ./waf --help &> /dev/null
-    mv .waf-*/* .
-    sed -i '/^#==>$/,$d' waf
-    rmdir .waf-*
+  ./waf --help &> /dev/null
+  mv .waf-*/* .
+  sed -i '/^#==>$/,$d' waf
+  rmdir .waf-*
 fi
 
 cd $orig
@@ -51,10 +48,10 @@ cp ../COPYING.txt copyright
 mkdir source
 echo "3.0 (native)" > source/format
 
-trusty_bdeps=
+trusty_bdeps=ffmpeg-bomi
 trusty_deps=libqt5qml-quickcontrols
 
-utopic_bdeps=
+utopic_bdeps=ffmpeg-bomi
 utopic_deps=qml-module-qtquick-controls
 
 bdeps=

download-ffmpeg

@@ -2,7 +2,7 @@
 
 install -d src
 
-version=2.5.3
+version=2.5.4
 url=http://www.ffmpeg.org/releases/ffmpeg-${version}.tar.gz
 out=ffmpeg.tar.gz
 if ! [ -f ${out} ]; then