summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Mitchell <kevmitch@math.sfu.ca>2014-01-28 08:45:16 -0800
committerKevin Mitchell <kevmitch@math.sfu.ca>2014-01-28 08:45:16 -0800
commit3791b20eb0e90df52f17d85c8212760e308ab8ae (patch)
treeff386bb7ba2b07a00d4b1dd602f423a661a75269
parentfa14d6a40ba542282a745a49be90586d2e57948a (diff)
downloadmpv-build-3791b20eb0e90df52f17d85c8212760e308ab8ae.tar.bz2
mpv-build-3791b20eb0e90df52f17d85c8212760e308ab8ae.tar.xz
take fribidi build out of the debian pacakge and replace it with a
dependency on the debian pacakge libfribidi-dev
-rw-r--r--debian/changelog1
-rw-r--r--debian/control1
-rwxr-xr-xdebian/rules18
3 files changed, 4 insertions, 16 deletions
diff --git a/debian/changelog b/debian/changelog
index b8dd102..30fd4ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,6 @@
mpv (1:0.3.3) UNRELEASED; urgency=low
* reimagine for waf build system
- * build fribidi for the debian package
* test building on saucy,precise,stable,sid amd64
* enable as many mpv features as possible except:
+ libsdl2 (not available in wheezy or precise)
diff --git a/debian/control b/debian/control
index ddc54af..e929f4f 100644
--- a/debian/control
+++ b/debian/control
@@ -20,6 +20,7 @@ Build-Depends:
libenca-dev,
libfontconfig-dev,
libfreetype6-dev,
+ libfribidi-dev,
libgl1-mesa-dev,
libguess-dev,
libjack-dev,
diff --git a/debian/rules b/debian/rules
index 3e62800..5b28c4b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,5 @@
#! /usr/bin/make -f
-# This alters the return value of dpkg-buildflags for CFLAGS and friends.
-# It is necessary to build fribidi which has an insecure print(stringvar)
-# statement. I believe there is something equivalent going on in the
-# libfribidi0=0.19.6-1 package source which is far less obvious. There
-# should probably be a patch for fribidi to fix this if possible.
-export DEB_BUILD_MAINT_OPTIONS=hardening=-format
-
# from official debian package: testing welcome!
ifeq ($(DEB_HOST_ARCH_CPU),$(filter $(DEB_HOST_ARCH_CPU),powerpc sparc))
export CC=gcc-4.8 # fixes #73363
@@ -30,21 +23,17 @@ install:
# this will do for now
# the dependencies must be built before mpv is configured
-fribidi_config:
- scripts/fribidi-config
-fribidi_build:fribidi_config
- scripts/fribidi-build
ffmpeg_config:
scripts/ffmpeg-config
ffmpeg_build:ffmpeg_config
scripts/ffmpeg-build
-libass_config:fribidi_build
+libass_config:
scripts/libass-config
libass_build:libass_config
scripts/libass-build
# put the config in the right place and drop the local/ since it's package managed now
-override_dh_auto_configure:ffmpeg_build libass_build fribidi_build
+override_dh_auto_configure:ffmpeg_build libass_build
scripts/mpv-config --prefix=/usr --confdir=/etc/mpv
override_dh_auto_build:
@@ -58,5 +47,4 @@ override_dh_auto_install:
override_dh_auto_clean:
scripts/mpv-clean
scripts/ffmpeg-clean
- scripts/libass-clean
- scripts/fribidi-clean
+ scripts/libass-clean