Commit e3177ef0 authored by abveritas's avatar abveritas

patches, hard coded deps versions for sound update

parent 1758118f
......@@ -10,13 +10,13 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=ffmpeg
pkgver=0.8.6
pkgrel=1
epoch=2
pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
arch=('i686' 'x86_64')
url="http://ffmpeg.org/"
license=('GPL')
depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg' 'rtmpdump' 'speex')
makedepends=('yasm')
#git clone git://git.videolan.org/ffmpeg.git
source=(http://$pkgname.org/releases/$pkgname-$pkgver.tar.bz2)
md5sums=('b4ef1fa6506750569fdb64a0f0a646a8')
......
......@@ -19,7 +19,7 @@ options=(!libtool !emptydirs)
source=(${url}/src/gst-plugins-bad/gst-plugins-bad-${pkgver}.tar.bz2
gst-plugins-bad-0.10.22-mjpegtools2.0.patch)
md5sums=('9a2acee1f386f71247003d0d7090fb1c'
'd1e4ba414877909f4a3313e905412a61')
'f12e8a12d04bab5d0b59d87a71b4ff9a')
build() {
cd "${srcdir}/gst-plugins-bad-${pkgver}"
......
......@@ -17,7 +17,7 @@ pkgdesc="An open source multimedia framework"
arch=('i686' 'x86_64')
url="http://www.mltframework.org"
license=('GPL')
depends=('sdl_image' 'libsamplerate' 'libdv' 'qt' 'sox' 'libxml2' 'ffmpeg' 'frei0r-plugins' 'swig' 'python2')
depends=('sdl_image' 'libsamplerate' 'libdv' 'qt' 'sox' 'libxml2' 'ffmpeg=0.8.6' 'frei0r-plugins' 'swig' 'python2')
optdepends=('jack')
makedepends=('subversion')
conflicts=('mlt++<=0.3.8')
......
......@@ -78,7 +78,7 @@ package_phonon-backend-gstreamer()
url="http://phonon.kde.org"
pkgdesc="Phonon GStreamer backend"
license=('LGPL')
depends=('gstreamer0.10-base-plugins' "phonon")
depends=('gstreamer0.10-base-plugins' "phonon=4.5.1")
groups=("kde-complete" "kde-uninstall")
conflicts=('phonon-gstreamer')
replaces=('phonon-gstreamer')
......@@ -93,7 +93,7 @@ package_phonon-backend-xine()
url="http://phonon.kde.org"
pkgdesc="Phonon Xine backend"
license=('LGPL')
depends=('xine-lib' "phonon")
depends=('xine-lib' "phonon=4.5.1")
groups=("kde-complete" "kde-uninstall")
conflicts=('phonon-xine')
replaces=('phonon-xine')
......@@ -110,7 +110,7 @@ package_phonon-backend-mplayer()
pkgdesc="Phonon MPlayer backend"
url="http://www.gitorious.org/phonon/phonon-${bename}"
license=("LGPL")
depends=("phonon" "${bename}")
depends=("phonon=4.5.1" "${bename}")
groups=("kde-complete" "kde-uninstall")
conflicts=("phonon-${bename}-svn" 'phonon-mplayer')
replaces=("phonon-${bename}-svn" 'phonon-mplayer')
......@@ -152,7 +152,7 @@ package_phonon-backend-vlc()
pkgdesc="Phonon VLC backend"
url="http://gitorious.org/phonon/phonon-vlc"
license=('LGPL')
depends=('vlc' "phonon")
depends=('vlc' "phonon=4.5.1")
groups=("kde-complete" "kde-uninstall")
replaces=('phonon-vlc-svn' 'phonon-vlc')
conflicts=('phonon-vlc-svn' 'phonon-vlc')
......
......@@ -15,23 +15,24 @@ pkgdesc="A video/DVD ripper and encoder for the terminal/console."
arch=('i686' 'x86_64')
url="http://tcforge.berlios.de/"
license=('GPL')
depends=('gawk' 'imagemagick' 'lzo2' 'libdv' 'libdvdread' 'ffmpeg' 'mjpegtools'
depends=('gawk' 'imagemagick' 'lzo2' 'libdv' 'libdvdread' 'ffmpeg=0.8.6' 'mjpegtools'
'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec')
makedepends=('nasm' 'pkgconfig')
options=('!libtool' '!makeflags')
source=(http://download2.berlios.de/tcforge/${pkgname}-${pkgver}.tar.bz2
http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz
transcode-1.1.5-jpeg-7.patch transcode-1.1.5-mpa.patch)
transcode-1.1.5-jpeg-7.patch transcode-1.1.5-mpa.patch transcode-1.1.5-ffmpeg.patch)
md5sums=('41ac6b1c0fe30f3aab286e771fc31b9e'
'c0bd49a88f667c68c4430ad25bbed510'
'af4056b7530a6f147594f676849e7c7b'
'c299cfc6c4be6a5512d1a129f04e5450')
'c299cfc6c4be6a5512d1a129f04e5450'
'ed2c3b7471ad3e94d44c3d3ea4348e1c')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -p0 < ../transcode-1.1.5-jpeg-7.patch
patch -p1 < ../transcode-1.1.5-mpa.patch
patch -p1 < ../transcode-1.1.5-ffmpeg.patch
# building from here
./configure --prefix=/usr \
......
Index: transcode-1.1.5/encode/encode_lavc.c
===================================================================
--- transcode-1.1.5.orig/encode/encode_lavc.c
+++ transcode-1.1.5/encode/encode_lavc.c
@@ -955,8 +955,6 @@ static void tc_lavc_config_defaults(TCLa
/*
* context *transcode* (not libavcodec) defaults
*/
- pd->ff_vcontext.mb_qmin = 2;
- pd->ff_vcontext.mb_qmax = 31;
pd->ff_vcontext.max_qdiff = 3;
pd->ff_vcontext.max_b_frames = 0;
pd->ff_vcontext.me_range = 0;
@@ -1116,8 +1114,6 @@ static int tc_lavc_read_config(TCLavcPri
// handled by transcode core
// { "vqmax", PCTX(qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
// handled by transcode core
- { "mbqmin", PCTX(mb_qmin), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
- { "mbqmax", PCTX(mb_qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
{ "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
{ "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
{ "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 },
Index: transcode-1.1.5/export/aud_aux.c
===================================================================
--- transcode-1.1.5.orig/export/aud_aux.c
+++ transcode-1.1.5/export/aud_aux.c
@@ -347,7 +347,7 @@ static int tc_audio_init_ffmpeg(vob_t *v
//-- set parameters (bitrate, channels and sample-rate) --
//--------------------------------------------------------
memset(&mpa_ctx, 0, sizeof(mpa_ctx)); // default all
- mpa_ctx.codec_type = CODEC_TYPE_AUDIO;
+ mpa_ctx.codec_type = AVMEDIA_TYPE_AUDIO;
mpa_ctx.bit_rate = vob->mp3bitrate * 1000; // bitrate dest.
mpa_ctx.channels = vob->dm_chan; // channels
mpa_ctx.sample_rate = vob->a_rate;
Index: transcode-1.1.5/export/export_ffmpeg.c
===================================================================
--- transcode-1.1.5.orig/export/export_ffmpeg.c
+++ transcode-1.1.5/export/export_ffmpeg.c
@@ -643,8 +643,6 @@ MOD_init
lavc_venc_context->bit_rate = vob->divxbitrate * 1000;
lavc_venc_context->bit_rate_tolerance = lavc_param_vrate_tolerance * 1000;
- lavc_venc_context->mb_qmin = lavc_param_mb_qmin;
- lavc_venc_context->mb_qmax = lavc_param_mb_qmax;
lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5);
lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5);
lavc_venc_context->max_qdiff = lavc_param_vqdiff;
Index: transcode-1.1.5/import/decode_lavc.c
===================================================================
--- transcode-1.1.5.orig/import/decode_lavc.c
+++ transcode-1.1.5/import/decode_lavc.c
@@ -261,8 +261,12 @@ void decode_lavc(decode_t *decode)
//tc_log_msg(__FILE__, "SIZE: (%d) MP4(%d) blen(%d) BUF(%d) read(%ld)", len, mp4_size, buf_len, READ_BUFFER_SIZE, bytes_read);
do {
- len = avcodec_decode_video(lavc_dec_context, &picture,
- &got_picture, buffer+buf_len, mp4_size-buf_len);
+ AVPacket pkt;
+ av_init_packet( &pkt );
+ pkt.data = buffer+buf_len;
+ pkt.size = mp4_size-buf_len;
+ len = avcodec_decode_video2(lavc_dec_context, &picture,
+ &got_picture, &pkt);
if (len < 0) {
tc_log_error(__FILE__, "frame decoding failed");
Index: transcode-1.1.5/import/probe_ffmpeg.c
===================================================================
--- transcode-1.1.5.orig/import/probe_ffmpeg.c
+++ transcode-1.1.5/import/probe_ffmpeg.c
@@ -47,7 +47,7 @@ static void translate_info(const AVForma
for (i = 0; i < ctx->nb_streams; i++) {
st = ctx->streams[i];
- if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
+ if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
info->bitrate = st->codec->bit_rate / 1000;
info->width = st->codec->width;
info->height = st->codec->height;
@@ -65,7 +65,7 @@ static void translate_info(const AVForma
for (i = 0; i < ctx->nb_streams; i++) {
st = ctx->streams[i];
- if (st->codec->codec_type == CODEC_TYPE_AUDIO
+ if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO
&& j < TC_MAX_AUD_TRACKS) {
info->track[j].format = 0x1; /* known wrong */
info->track[j].chan = st->codec->channels;
Index: transcode-1.1.5/export/ffmpeg_cfg.c
===================================================================
--- transcode-1.1.5.orig/export/ffmpeg_cfg.c
+++ transcode-1.1.5/export/ffmpeg_cfg.c
@@ -34,8 +34,6 @@ int lavc_param_vme = 4;
//int lavc_param_vqscale = 0;
//int lavc_param_vqmin = 2;
//int lavc_param_vqmax = 31;
-int lavc_param_mb_qmin = 2;
-int lavc_param_mb_qmax = 31;
int lavc_param_lmin = 2;
int lavc_param_lmax = 31;
int lavc_param_vqdiff = 3;
@@ -140,8 +138,6 @@ TCConfigEntry lavcopts_conf[]={
// {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
// {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
// {"vqmax", &lavc_param_vqmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
- {"mbqmin", &lavc_param_mb_qmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
- {"mbqmax", &lavc_param_mb_qmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
{"lmin", &lavc_param_lmin, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0},
{"lmax", &lavc_param_lmax, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0},
{"vqdiff", &lavc_param_vqdiff, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
Index: transcode-1.1.5/export/ffmpeg_cfg.h
===================================================================
--- transcode-1.1.5.orig/export/ffmpeg_cfg.h
+++ transcode-1.1.5/export/ffmpeg_cfg.h
@@ -13,8 +13,6 @@ extern int lavc_param_vme;
//extern int lavc_param_vqscale;
//extern int lavc_param_vqmin;
//extern int lavc_param_vqmax;
-extern int lavc_param_mb_qmin;
-extern int lavc_param_mb_qmax;
extern int lavc_param_lmin;
extern int lavc_param_lmax;
extern int lavc_param_vqdiff;
......@@ -54,7 +54,7 @@ package_vlc() {
depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libcdio'
'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa'
'lua' 'libv4l' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2'
'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg=0.8.6' 'faad2'
'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'
'ttf-freefont' 'libxv' 'libass' 'xdg-utils')
optdepends=('avahi: for service discovery using bonjour protocol'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment