2mandvd rebuild against new sound stack

This commit is contained in:
Neophytos 2013-04-01 08:56:04 +00:00
parent 46ffd99418
commit 3df62bcdc8
2 changed files with 26 additions and 17 deletions

View File

@ -1,23 +1,26 @@
# #maintainer: Neophytos Kolokotronis <tetris4@gmail.com>
# Apps Packages for Chakra, part of chakra-project.org
#
pkgname=2mandvd pkgname=2mandvd
pkgver=1.8.4 pkgver=1.8.4
pkgrel=3 pkgrel=5
pkgdesc="DVD Authoring Maker In Linux Environnement" pkgdesc="DVD Authoring Maker In Linux Environment."
url="http://2mandvd.tuxfamily.org/" url="http://2mandvd.tuxfamily.org/"
license=('GPL') license=('GPL')
arch=('i686' 'x86_64') arch=('x86_64')
depends=('qt>=4.6' 'sox' 'mplayer' 'perl' 'netpbm' 'transcode' 'ffmpegthumbnailer' 'dvdauthor' 'mjpegtools' 'ttf-dejavu' 'dvd+rw-tools' 'exif' 'python-opengl') depends=('qt' 'sox' 'mencoder' 'perl' 'netpbm' 'transcode' 'ffmpegthumbnailer' 'dvdauthor' 'mjpegtools' 'ttf-dejavu' 'dvd+rw-tools' 'exif' 'python-opengl')
optdepends=('xine-ui: to preview the result') optdepends=('xine-ui: to preview the result')
categories=('multimedia') categories=('multimedia')
screenshot=('http://i1-linux.softpedia-static.com/screenshots/2ManDVD_1.jpg') screenshot=('http://i1-linux.softpedia-static.com/screenshots/2ManDVD_1.jpg')
source=("http://download.tuxfamily.org/${pkgname}/2ManDVD-${pkgver}.tar.gz") source=("http://download.tuxfamily.org/2mandvd/2ManDVD-${pkgver}.tar.gz"
md5sums=('2e362b6d963b0698ee4911d28865d50d') "ffmpeg-0.11.diff")
sha1sums=('3ed5b79e88c05159ac05cb40a39a702e3c400c79'
'e8bfd4adb11f5641a55719ff7d346f061281e8b2')
build() { build() {
cd "${srcdir}" cd "${srcdir}"
# Patch 2ManDVD for ffmpeg
patch -p0 -i "${srcdir}/ffmpeg-0.11.diff"
# Prepare the build directory and configure the project # Prepare the build directory and configure the project
rm -rf build && mkdir -p build rm -rf build && mkdir -p build
@ -25,10 +28,6 @@ build() {
qmake "${srcdir}/2ManDVD/2ManDVD.pro" qmake "${srcdir}/2ManDVD/2ManDVD.pro"
#Temporary fix for libavformat version (added by boom1992)
sed -i "41s|#ifdef|//#ifdef|" $srcdir/2ManDVD/videowrapper.cpp
sed -i '42i #if LIBAVFORMAT_VERSION_MAJOR >= 53' $srcdir/2ManDVD/videowrapper.cpp
# Fix those damn absolute paths! # Fix those damn absolute paths!
sed -e 's,chmod -R 755 /usr/share/2ManDVD,chmod -R 755 \$(INSTALL_ROOT)/usr/share/2ManDVD,g' \ sed -e 's,chmod -R 755 /usr/share/2ManDVD,chmod -R 755 \$(INSTALL_ROOT)/usr/share/2ManDVD,g' \
-i Makefile -i Makefile
@ -37,9 +36,8 @@ build() {
make make
} }
package() { package(){
cd "${srcdir}/build" cd "${srcdir}/build"
make install INSTALL_ROOT="${pkgdir}"
}
# vim:set ts=2 sw=2 et: make INSTALL_ROOT="${pkgdir}" install
}

11
2mandvd/ffmpeg-0.11.diff Normal file
View File

@ -0,0 +1,11 @@
--- 2ManDVD/videowrapper.cpp 2012-06-06 09:25:24.000000000 +0000
+++ 2ManDVD.fixed/videowrapper.cpp 2012-09-04 19:45:46.161280095 +0000
@@ -38,7 +38,7 @@
int videowrapper::load_video(QString filename)
{
// *** OUVERTURE DU FICHIER VIDEO ***
- #ifdef avformat_open_input
+ #if 1//def avformat_open_input
if (avformat_open_input(&pFormatCtx,filename.toAscii().data(),NULL,NULL)!=0)
{
#else