summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonidas Spyropoulos2018-06-27 08:00:11 +0100
committerLeonidas Spyropoulos2018-06-27 08:00:11 +0100
commitef621c27a351e12e2196272200e198822291aa66 (patch)
tree97d64db1595095a6264ffe9e7f7f9553bf51ec87
parentd0251f797b4d1d5e6c87be10405ad42fd6b46f74 (diff)
downloadaur-ef621c27a351e12e2196272200e198822291aa66.tar.gz
upgpkg: dvdstyler 3.0.4-5
Patch for building against new ffmpeg
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD13
-rw-r--r--new_ffmpeg.patch11
3 files changed, 24 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4d0b78cf0b17..106d83fa9084 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = dvdstyler
pkgdesc = Cross-platform DVD authoring application
pkgver = 3.0.4
- pkgrel = 4
+ pkgrel = 5
url = http://www.dvdstyler.de/
arch = i686
arch = x86_64
@@ -23,7 +23,9 @@ pkgbase = dvdstyler
optdepends = vlc: DVD preview player
optdepends = smplayer: DVD preview player
source = http://downloads.sourceforge.net/dvdstyler/3.0.4/DVDStyler-3.0.4.tar.bz2
+ source = new_ffmpeg.patch
sha1sums = 0ff6de099d177c05c34f536defc1562e520b9703
+ sha1sums = ffa32e3961d65bde9c2609fb1ae579a47ac61e8f
pkgname = dvdstyler
diff --git a/PKGBUILD b/PKGBUILD
index dad7ff8c861d..028098438e66 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=dvdstyler
pkgver=3.0.4
-pkgrel=4
+pkgrel=5
pkgdesc="Cross-platform DVD authoring application"
arch=('i686' 'x86_64')
url="http://www.dvdstyler.de/"
@@ -17,8 +17,15 @@ optdepends=('dvdisaster: ECC support'
'xine-ui: DVD preview player'
'vlc: DVD preview player'
'smplayer: DVD preview player')
-source=(http://downloads.sourceforge.net/dvdstyler/${pkgver}/DVDStyler-${pkgver}.tar.bz2)
-sha1sums=('0ff6de099d177c05c34f536defc1562e520b9703')
+source=("http://downloads.sourceforge.net/dvdstyler/${pkgver}/DVDStyler-${pkgver}.tar.bz2"
+ "new_ffmpeg.patch")
+sha1sums=('0ff6de099d177c05c34f536defc1562e520b9703'
+ 'ffa32e3961d65bde9c2609fb1ae579a47ac61e8f')
+
+prepare() {
+ cd "$srcdir/DVDStyler-$pkgver"
+ patch -p0 -i ../new_ffmpeg.patch
+}
build() {
cd "${srcdir}/DVDStyler-${pkgver}"
diff --git a/new_ffmpeg.patch b/new_ffmpeg.patch
new file mode 100644
index 000000000000..5c6d50c60c20
--- /dev/null
+++ b/new_ffmpeg.patch
@@ -0,0 +1,11 @@
+--- src/mediaenc_ffmpeg.cpp
++++ src/mediaenc_ffmpeg.cpp
+@@ -223,7 +223,7 @@
+ c->time_base = (AVRational){ 1, c->sample_rate };
+ // some formats want stream headers to be separate
+ if(m_outputCtx->oformat->flags & AVFMT_GLOBALHEADER)
+- c->flags |= CODEC_FLAG_GLOBAL_HEADER;
++ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+
+ return true;
+ }