diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2011-11-23 17:44:22 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-11-23 17:44:22 +0100 |
commit | 2834c39eaa8a97fa6d3a2355f46b21da3a4bb8de (patch) | |
tree | c7e5032604c3c6a2ba63599389c26873cbf3c65c /extra | |
parent | 5f0ea75dbd480a1ced023070da9847e1c6959692 (diff) | |
parent | 851ab9aa99e9bda38f88b5f5ade096c9137e11c8 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/acetoneiso2/PKGBUILD
community/gpsman/PKGBUILD
community/gts/PKGBUILD
community/lat/PKGBUILD
community/pidgin-fonomobutton/PKGBUILD
community/qemu-launcher/PKGBUILD
core/isdn4k-utils/PKGBUILD
extra/nouveau-drm-lts/PKGBUILD
Diffstat (limited to 'extra')
-rw-r--r-- | extra/nouveau-drm-lts/COPYING | 48 | ||||
-rw-r--r-- | extra/nouveau-drm-lts/Makefile | 102 | ||||
-rw-r--r-- | extra/nouveau-drm-lts/PKGBUILD | 48 | ||||
-rw-r--r-- | extra/nouveau-drm-lts/dont_check_for_pthread.patch | 49 | ||||
-rw-r--r-- | extra/nouveau-drm-lts/nouveau-drm.install | 16 | ||||
-rw-r--r-- | extra/transcode/transcode-1.1.5-ffmpeg.patch | 124 | ||||
-rw-r--r-- | extra/transcode/transcode-1.1.5-jpeg-7.patch | 16 | ||||
-rw-r--r-- | extra/transcode/transcode-1.1.5-mpa.patch | 10 | ||||
-rw-r--r-- | extra/valgrind/valgrind-3.6.1-glibc-2.14.patch | 67 | ||||
-rw-r--r-- | extra/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch | 13 | ||||
-rw-r--r-- | extra/xine-lib/xine-lib-1.1.19-ffmpeg.patch | 380 | ||||
-rw-r--r-- | extra/xine-lib/xine-lib-1.1.19-xvmc.patch | 17 |
12 files changed, 0 insertions, 890 deletions
diff --git a/extra/nouveau-drm-lts/COPYING b/extra/nouveau-drm-lts/COPYING deleted file mode 100644 index 6e74c337c..000000000 --- a/extra/nouveau-drm-lts/COPYING +++ /dev/null @@ -1,48 +0,0 @@ - Copyright 2005 Adam Jackson. - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation on the rights to use, copy, modify, merge, - publish, distribute, sub license, and/or sell copies of the Software, - and to permit persons to whom the Software is furnished to do so, - subject to the following conditions: - - The above copyright notice and this permission notice (including the - next paragraph) shall be included in all copies or substantial - portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NON-INFRINGEMENT. IN NO EVENT SHALL ADAM JACKSON BE LIABLE FOR ANY - CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - ------------------------------------------------------------------------- - - Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. - Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. - All Rights Reserved. - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: - - The above copyright notice and this permission notice (including the - next paragraph) shall be included in all copies or substantial - portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS - SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. diff --git a/extra/nouveau-drm-lts/Makefile b/extra/nouveau-drm-lts/Makefile deleted file mode 100644 index 123bc5339..000000000 --- a/extra/nouveau-drm-lts/Makefile +++ /dev/null @@ -1,102 +0,0 @@ -# This Makefile is loosely based on the drm.git/linux-core/Makefile and -# the preliminary work by Christopher James Halse Rogers. -# Edited by Pekka Paalanen <pq@iki.fi> - -# By default, the build is done against the running linux kernel source. -# To build against a different kernel source tree, set LINUXDIR: -# -# make LINUXDIR=/path/to/kernel/source - -# By default, it is assumed the Nouveau kernel tree is found in $PWD/../. -# To use a different path to the Nouveau kernel tree, set NOUVEAUROOTDIR: -# -# make NOUVEAUROOTDIR=/path/to/nouveau/linux-2.6 - - -ifndef LINUXDIR -RUNNING_REL := $(shell uname -r) - -LINUXDIR := $(shell if [ -e /lib/modules/$(RUNNING_REL)/source ]; then \ - echo /lib/modules/$(RUNNING_REL)/source; \ - else echo /lib/modules/$(RUNNING_REL)/build; fi) -endif - -NOUVEAUGITREMOTE ?= origin -NOUVEAUROOTDIR ?= $(CURDIR)/.. -override NOUVEAUROOTDIR := $(abspath $(NOUVEAUROOTDIR)) - -TESTFILE := include/drm/nouveau_drm.h -ifeq ($(wildcard $(NOUVEAUROOTDIR)/$(TESTFILE)),) -$(error $(NOUVEAUROOTDIR) does not look like the right kernel tree, \ - please set NOUVEAUROOTDIR) -endif - -GIT_REVISION := $(shell GIT_DIR=$(NOUVEAUROOTDIR)/.git \ - git describe --always --abbrev=17 2> /dev/null) - -DRMINC := -I$(NOUVEAUROOTDIR)/include/drm -DRMDIR := $(NOUVEAUROOTDIR)/drivers/gpu/drm -DRMCFG := \ - CONFIG_DRM=m \ - CONFIG_DRM_KMS_HELPER=m \ - CONFIG_DRM_TTM=m \ - CONFIG_DRM_NOUVEAU=m \ - CONFIG_DRM_NOUVEAU_KMS=n \ - CONFIG_DRM_NOUVEAU_BACKLIGHT=y \ - CONFIG_DRM_NOUVEAU_DEBUG=y \ - CONFIG_DRM_I2C_CH7006=m \ - CONFIG_DRM_TDFX=n \ - CONFIG_DRM_R128=n \ - CONFIG_DRM_RADEON=n \ - CONFIG_DRM_MGA=n \ - CONFIG_DRM_I810=n \ - CONFIG_DRM_I830=n \ - CONFIG_DRM_I915=n \ - CONFIG_DRM_SIS=n \ - CONFIG_DRM_SAVAGE=n \ - CONFIG_DRM_VIA=n - -EXTRA_CFLAGS := -MYEXTRA_CFLAGS := -MYEXTRA_CFLAGS += -DCONFIG_DRM_NOUVEAU_BACKLIGHT -MYEXTRA_CFLAGS += -DCONFIG_DRM_NOUVEAU_DEBUG - -ifneq ($(GIT_REVISION),) -MYEXTRA_CFLAGS += '-DGIT_REVISION=\"$(GIT_REVISION)\"' -endif - -MYPARMS := -C $(LINUXDIR) KCPPFLAGS="$(DRMINC)" SUBDIRS="$(DRMDIR)" $(DRMCFG) - -MYEXTRA_CFLAGS += $(EXTRA_CFLAGS) -ifneq ($(MYEXTRA_CFLAGS),) -MYPARMS += EXTRA_CFLAGS="$(MYEXTRA_CFLAGS)" -endif - -.PHONY: all modules install clean archive FORCE - -all: modules -FORCE: - -modules: - $(MAKE) $(MYPARMS) modules - -install: - $(MAKE) $(MYPARMS) modules_install - -clean: - $(MAKE) $(MYPARMS) clean - -archive: newttm-devel-compat.tar.gz newttm-devel.tar.gz master.tar.gz - -newttm-devel-compat.tar.gz: EXTRAS=nouveau README-nouveau - -%.tar: FORCE - GIT_DIR=$(NOUVEAUROOTDIR)/.git \ - git archive --format=tar --prefix=$*/ $(NOUVEAUGITREMOTE)/$* \ - drivers/gpu/drm include/drm $(EXTRAS) > $@ - -%.tar.gz: %.tar - gzip -9 -c $< > $@ - -# The commit id of the archive can be read with -# $ zcat foo.tar.gz | git get-tar-commit-id diff --git a/extra/nouveau-drm-lts/PKGBUILD b/extra/nouveau-drm-lts/PKGBUILD deleted file mode 100644 index 87d374541..000000000 --- a/extra/nouveau-drm-lts/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 142808 2011-11-15 14:48:15Z tpowa $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: buddabrod <buddabrod@gmail.com> - -pkgname=nouveau-drm-lts -_snapdate=20100313 -pkgver=0.0.16_${_snapdate} # see master/drivers/gpu/drm/nouveau/nouveau_drv.h for version -_extramodules=extramodules-2.6.32-lts -_kernver="$(cat /lib/modules/${_extramodules}/version)" -pkgrel=7 -pkgdesc="nvidia opensource X driver" -arch=('i686' 'x86_64' 'mips64el') -url="http://nouveau.freedesktop.org/" -depends=("kernel26-lts>=2.6.32" "kernel26-lts<2.6.33") -makedepends=("kernel26-lts-headers>=2.6.32" "kernel26-lts-headers<2.6.33") -# http://nouveau.freedesktop.org/wiki/InstallDRM#head-771a47a133fba6a5a70253656e76c61e9bff93bd -optdepends=('nouveau-firmware: needed for very new card (NV50 family and above) to work properly where the OSS replacement does not work well') -#makedepends=('git' 'autoconf' 'pkgconfig') -install=nouveau-drm.install -license=('GPL') -options=('!strip') -source=(ftp://ftp.archlinux.org/other/${pkgname/-lts//}/master-${_snapdate}.tar.gz - # http://people.freedesktop.org/~pq/nouveau-drm/master.tar.gz - # get the Makefile from http://cgit.freedesktop.org/nouveau/linux-2.6/plain/nouveau/Makefile?h=master-compat - Makefile) -md5sums=('ad7ad0fb73d56bcff3d2b54a70c3d511' - 'e7d5df80186d5c736e82b0a7d46216bc') - -build() { - cd ${srcdir}/master - mkdir nouveau - cp $srcdir/Makefile ${srcdir}/master/nouveau/ - cd nouveau - make LINUXDIR=/lib/modules/${_kernver}/build DRM_MODULES="nouveau" -} - -package() { - install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/drm.ko ${pkgdir}/lib/modules/${_extramodules}/updates/drm.ko - install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/drm_kms_helper.ko ${pkgdir}/lib/modules/${_extramodules}/updates/drm_kms_helper.ko - install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/nouveau/nouveau.ko ${pkgdir}/lib/modules/${_extramodules}/kernel/drivers/video/nouveau.ko - install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/ttm/ttm.ko ${pkgdir}/lib/modules/${_extramodules}/updates/ttm.ko - install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/i2c/ch7006.ko ${pkgdir}/lib/modules/${_extramodules}/updates/ch7006.ko - - # install script - sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" ${startdir}/nouveau-drm.install - # gzip -9 modules - find "$pkgdir" -name '*.ko' -exec gzip -9 {} \; -} diff --git a/extra/nouveau-drm-lts/dont_check_for_pthread.patch b/extra/nouveau-drm-lts/dont_check_for_pthread.patch deleted file mode 100644 index 050f55767..000000000 --- a/extra/nouveau-drm-lts/dont_check_for_pthread.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac ---- libdrm-2.4.0/configure.ac 2008-10-09 21:57:09.000000000 +0200 -+++ libdrm-2.4.0-nostubs/configure.ac 2008-10-21 10:48:24.000000000 +0200 -@@ -32,10 +32,6 @@ - AC_HEADER_STDC - AC_SYS_LARGEFILE - --PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs) --AC_SUBST(PTHREADSTUBS_CFLAGS) --AC_SUBST(PTHREADSTUBS_LIBS) -- - pkgconfigdir=${libdir}/pkgconfig - AC_SUBST(pkgconfigdir) - AC_ARG_ENABLE(udev, AS_HELP_STRING([--enable-udev], -diff -ru libdrm-2.4.0/libdrm/intel/Makefile.am libdrm-2.4.0-nostubs/libdrm/intel/Makefile.am ---- libdrm-2.4.0/libdrm/intel/Makefile.am 2008-10-14 01:39:32.000000000 +0200 -+++ libdrm-2.4.0-nostubs/libdrm/intel/Makefile.am 2008-10-21 10:49:00.000000000 +0200 -@@ -26,13 +26,12 @@ - $(WARN_CFLAGS) \ - -I$(top_srcdir)/libdrm \ - -I$(top_srcdir)/libdrm/intel \ -- $(PTHREADSTUBS_CFLAGS) \ - -I$(top_srcdir)/shared-core - - libdrm_intel_la_LTLIBRARIES = libdrm_intel.la - libdrm_intel_ladir = $(libdir) - libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined --libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ -+libdrm_intel_la_LIBADD = ../libdrm.la - - libdrm_intel_la_SOURCES = \ - intel_bufmgr.c \ ---- libdrm-2.4.5/libdrm/nouveau/Makefile.am.orig 2009-02-28 19:06:24.000000000 +0000 -+++ libdrm-2.4.5/libdrm/nouveau/Makefile.am 2009-02-28 19:06:33.000000000 +0000 -@@ -2,13 +2,12 @@ - $(WARN_CFLAGS) \ - -I$(top_srcdir)/libdrm \ - -I$(top_srcdir)/libdrm/nouveau \ -- $(PTHREADSTUBS_CFLAGS) \ - -I$(top_srcdir)/shared-core - - libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la - libdrm_nouveau_ladir = $(libdir) - libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined --libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ -+libdrm_nouveau_la_LIBADD = ../libdrm.la - - libdrm_nouveau_la_SOURCES = \ - nouveau_device.c \ diff --git a/extra/nouveau-drm-lts/nouveau-drm.install b/extra/nouveau-drm-lts/nouveau-drm.install deleted file mode 100644 index 2aa581d47..000000000 --- a/extra/nouveau-drm-lts/nouveau-drm.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { - EXTRAMODULES='extramodules-2.6.32-lts' - depmod $(cat /lib/modules/$EXTRAMODULES/version) - echo "if you are running kms in early mode please rebuild your initrd" -} - -post_upgrade() { - post_install $1 - rmmod nouveau || echo 'In order to use the new nouveau module, exit Xserver and unload it manually.' -} - -post_remove() { - EXTRAMODULES='extramodules-2.6.32-lts' - depmod $(cat /lib/modules/$EXTRAMODULES/version) -} - diff --git a/extra/transcode/transcode-1.1.5-ffmpeg.patch b/extra/transcode/transcode-1.1.5-ffmpeg.patch deleted file mode 100644 index 86e8272e9..000000000 --- a/extra/transcode/transcode-1.1.5-ffmpeg.patch +++ /dev/null @@ -1,124 +0,0 @@ -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; diff --git a/extra/transcode/transcode-1.1.5-jpeg-7.patch b/extra/transcode/transcode-1.1.5-jpeg-7.patch deleted file mode 100644 index 288932a61..000000000 --- a/extra/transcode/transcode-1.1.5-jpeg-7.patch +++ /dev/null @@ -1,16 +0,0 @@ -http://bugs.gentoo.org/show_bug.cgi?id=294488 - -Patch by: Salah Coronya - -Fix segmentation fault with jpeg-7 and above where dinfo.do_fancy_upsampling isn't set by default to FALSE anymore. - ---- export/export_jpg.c -+++ export/export_jpg.c -@@ -91,6 +91,7 @@ - - jpeg_set_quality(&encinfo, quality, TRUE); - encinfo.raw_data_in = TRUE; -+ encinfo.do_fancy_downsampling = FALSE; - encinfo.in_color_space = JCS_YCbCr; - - encinfo.comp_info[0].h_samp_factor = 2; diff --git a/extra/transcode/transcode-1.1.5-mpa.patch b/extra/transcode/transcode-1.1.5-mpa.patch deleted file mode 100644 index e7fb0fc1c..000000000 --- a/extra/transcode/transcode-1.1.5-mpa.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- transcode-1.1.5-old/export/aud_aux.c 2010-07-04 12:44:31.867550180 -0500 -+++ transcode-1.1.5/export/aud_aux.c 2010-07-04 13:41:01.253292529 -0500 -@@ -347,6 +347,7 @@ - //-- 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.bit_rate = vob->mp3bitrate * 1000; // bitrate dest. - mpa_ctx.channels = vob->dm_chan; // channels - mpa_ctx.sample_rate = vob->a_rate; diff --git a/extra/valgrind/valgrind-3.6.1-glibc-2.14.patch b/extra/valgrind/valgrind-3.6.1-glibc-2.14.patch deleted file mode 100644 index 7fd217016..000000000 --- a/extra/valgrind/valgrind-3.6.1-glibc-2.14.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- valgrind/configure.in.jj 2010-10-21 03:14:02.000000000 +0200 -+++ valgrind/configure.in 2010-11-05 17:09:18.674455299 +0100 -@@ -749,6 +759,13 @@ case "${GLIBC_VERSION}" in - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.14) -+ AC_MSG_RESULT(2.14 family) -+ AC_DEFINE([GLIBC_2_14], 1, [Define to 1 if you're using glibc 2.14.x]) -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; - aix5) - AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3) - AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 or 5.3]) -@@ -762,7 +779,7 @@ case "${GLIBC_VERSION}" in - - *) - AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}]) -- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.13]) -+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.14]) - AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION]) - AC_MSG_ERROR([or Darwin libc]) - ;; ---- valgrind/config.h.in.jj 2010-10-20 22:20:49.000000000 +0200 -+++ valgrind/config.h.in 2010-11-05 17:08:33.863454886 +0100 -@@ -33,6 +33,9 @@ - /* Define to 1 if you're using glibc 2.13.x */ - #undef GLIBC_2_13 - -+/* Define to 1 if you're using glibc 2.14.x */ -+#undef GLIBC_2_14 -+ - /* Define to 1 if you're using glibc 2.2.x */ - #undef GLIBC_2_2 - ---- valgrind/configure.jj 2010-10-21 03:16:18.000000000 +0200 -+++ valgrind/configure 2010-11-05 17:09:39.163455396 +0100 -@@ -6367,6 +6389,18 @@ $as_echo "#define GLIBC_2_13 1" >>confde - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.14) -+ echo "$as_me:$LINENO: result: 2.14 family" >&5 -+echo "${ECHO_T}2.14 family" >&6 -+ -+cat >>confdefs.h <<\_ACEOF -+#define GLIBC_2_14 1 -+_ACEOF -+ -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; - aix5) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: AIX 5.1 or 5.2 or 5.3" >&5 - $as_echo "AIX 5.1 or 5.2 or 5.3" >&6; } -@@ -6387,7 +6421,7 @@ $as_echo "#define DARWIN_LIBC 1" >>confd - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5 - $as_echo "unsupported version ${GLIBC_VERSION}" >&6; } -- as_fn_error "Valgrind requires glibc version 2.2 - 2.13" "$LINENO" 5 -+ as_fn_error "Valgrind requires glibc version 2.2 - 2.14" "$LINENO" 5 - as_fn_error "or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION" "$LINENO" 5 - as_fn_error "or Darwin libc" "$LINENO" 5 - ;; diff --git a/extra/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch b/extra/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch deleted file mode 100644 index 4b6ba9e35..000000000 --- a/extra/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- m4/optimizations.m4.orig 2005-11-27 01:20:08.000000000 +0100 -+++ m4/optimizations.m4 2005-11-27 01:22:56.000000000 +0100 -@@ -161,10 +161,6 @@ - ;; - - esac -- if test x"$archopt_val" != x; then -- CFLAGS="$sarchopt=$archopt_val $CFLAGS" -- DEBUG_CFLAGS="$sarchopt=$archopt_val $DEBUG_CFLAGS" -- fi - fi - else - dnl we have the Intel compiler diff --git a/extra/xine-lib/xine-lib-1.1.19-ffmpeg.patch b/extra/xine-lib/xine-lib-1.1.19-ffmpeg.patch deleted file mode 100644 index 6817aa989..000000000 --- a/extra/xine-lib/xine-lib-1.1.19-ffmpeg.patch +++ /dev/null @@ -1,380 +0,0 @@ -diff -r 717450d734f7 src/combined/ffmpeg/ff_audio_decoder.c ---- a/src/combined/ffmpeg/ff_audio_decoder.c Mon May 16 15:49:02 2011 +0100 -+++ b/src/combined/ffmpeg/ff_audio_decoder.c Mon May 16 19:46:49 2011 -0400 -@@ -46,6 +46,12 @@ - - #define AUDIOBUFSIZE (64 * 1024) - -+#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32) -+# define AVAUDIO 3 -+#else -+# define AVAUDIO 2 -+#endif -+ - typedef struct { - audio_decoder_class_t decoder_class; - } ff_audio_class_t; -@@ -255,6 +261,9 @@ - buf->decoder_info[2]); - - } else if (!(buf->decoder_flags & BUF_FLAG_SPECIAL)) { -+#if AVAUDIO > 2 -+ AVPacket avpkt; -+#endif - - if( !this->decoder_ok ) { - if ( ! this->context || ! this->codec ) { -@@ -286,11 +295,21 @@ - if (!this->output_open) { - if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) { - decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE; -+#if AVAUDIO > 2 -+ av_init_packet (&avpkt); -+ avpkt.data = (uint8_t *)&this->buf[0]; -+ avpkt.size = this->size; -+ avpkt.flags = AV_PKT_FLAG_KEY; -+ avcodec_decode_audio3 (this->context, -+ (int16_t *)this->decode_buffer, -+ &decode_buffer_size, &avpkt); -+#else - avcodec_decode_audio2 (this->context, - (int16_t *)this->decode_buffer, - &decode_buffer_size, - &this->buf[0], - this->size); -+#endif - this->audio_bits = this->context->bits_per_sample; - this->audio_sample_rate = this->context->sample_rate; - this->audio_channels = this->context->channels; -@@ -311,12 +330,21 @@ - offset = 0; - while (this->size>0) { - decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE; -+#if AVAUDIO > 2 -+ av_init_packet (&avpkt); -+ avpkt.data = (uint8_t *)&this->buf[offset]; -+ avpkt.size = this->size; -+ avpkt.flags = AV_PKT_FLAG_KEY; -+ bytes_consumed = avcodec_decode_audio3 (this->context, -+ (int16_t *)this->decode_buffer, -+ &decode_buffer_size, &avpkt); -+#else - bytes_consumed = avcodec_decode_audio2 (this->context, - (int16_t *)this->decode_buffer, - &decode_buffer_size, - &this->buf[offset], - this->size); -- -+#endif - if (bytes_consumed<0) { - xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, - "ffmpeg_audio_dec: error decompressing audio frame\n"); -diff -r 717450d734f7 src/combined/ffmpeg/ff_video_decoder.c ---- a/src/combined/ffmpeg/ff_video_decoder.c Mon May 16 15:49:02 2011 +0100 -+++ b/src/combined/ffmpeg/ff_video_decoder.c Mon May 16 19:46:49 2011 -0400 -@@ -58,6 +58,14 @@ - - #define ENABLE_DIRECT_RENDERING - -+#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32) -+# define AVVIDEO 2 -+#else -+# define AVVIDEO 1 -+# define pp_context pp_context_t -+# define pp_mode pp_mode_t -+#endif -+ - /* reordered_opaque appeared in libavcodec 51.68.0 */ - #define AVCODEC_HAS_REORDERED_OPAQUE - #if LIBAVCODEC_VERSION_INT < 0x334400 -@@ -116,8 +124,8 @@ - - int pp_quality; - int pp_flags; -- pp_context_t *pp_context; -- pp_mode_t *pp_mode; -+ pp_context *our_context; -+ pp_mode *our_mode; - - /* mpeg-es parsing */ - mpeg_parser_t *mpeg_parser; -@@ -444,23 +452,23 @@ - this->pp_quality = this->class->pp_quality; - - if(this->pp_available && this->pp_quality) { -- if(!this->pp_context && this->context) -- this->pp_context = pp_get_context(this->context->width, this->context->height, -+ if(!this->our_context && this->context) -+ this->our_context = pp_get_context(this->context->width, this->context->height, - this->pp_flags); -- if(this->pp_mode) -- pp_free_mode(this->pp_mode); -+ if(this->our_mode) -+ pp_free_mode(this->our_mode); - -- this->pp_mode = pp_get_mode_by_name_and_quality("hb:a,vb:a,dr:a", -+ this->our_mode = pp_get_mode_by_name_and_quality("hb:a,vb:a,dr:a", - this->pp_quality); - } else { -- if(this->pp_mode) { -- pp_free_mode(this->pp_mode); -- this->pp_mode = NULL; -+ if(this->our_mode) { -+ pp_free_mode(this->our_mode); -+ this->our_mode = NULL; - } - -- if(this->pp_context) { -- pp_free_context(this->pp_context); -- this->pp_context = NULL; -+ if(this->our_context) { -+ pp_free_context(this->our_context); -+ this->our_context = NULL; - } - } - } -@@ -1055,12 +1063,26 @@ - } - - /* skip decoding b frames if too late */ -+#if AVVIDEO > 1 -+ this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT; -+#else - this->context->hurry_up = (this->skipframes > 0); -+#endif - - lprintf("avcodec_decode_video: size=%d\n", this->mpeg_parser->buffer_size); -+#if AVVIDEO > 1 -+ AVPacket avpkt; -+ av_init_packet(&avpkt); -+ avpkt.data = (uint8_t *)this->mpeg_parser->chunk_buffer; -+ avpkt.size = this->mpeg_parser->buffer_size; -+ avpkt.flags = AV_PKT_FLAG_KEY; -+ len = avcodec_decode_video2 (this->context, this->av_frame, -+ &got_picture, &avpkt); -+#else - len = avcodec_decode_video (this->context, this->av_frame, - &got_picture, this->mpeg_parser->chunk_buffer, - this->mpeg_parser->buffer_size); -+#endif - lprintf("avcodec_decode_video: decoded_size=%d, got_picture=%d\n", - len, got_picture); - len = current - buf->content - offset; -@@ -1112,7 +1134,13 @@ - - } else { - -- if (this->context->hurry_up) { -+ if ( -+#if AVVIDEO > 1 -+ this->context->skip_frame != AVDISCARD_DEFAULT -+#else -+ this->context->hurry_up -+#endif -+ ) { - /* skipped frame, output a bad frame */ - img = this->stream->video_out->get_frame (this->stream->video_out, - this->bih.biWidth, -@@ -1304,13 +1332,25 @@ - got_picture = 0; - } else { - /* skip decoding b frames if too late */ -+#if AVVIDEO > 1 -+ this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT; -+#else - this->context->hurry_up = (this->skipframes > 0); -- -+#endif - lprintf("buffer size: %d\n", this->size); -+#if AVVIDEO > 1 -+ AVPacket avpkt; -+ av_init_packet(&avpkt); -+ avpkt.data = (uint8_t *)&chunk_buf[offset]; -+ avpkt.size = this->size; -+ avpkt.flags = AV_PKT_FLAG_KEY; -+ len = avcodec_decode_video2 (this->context, this->av_frame, -+ &got_picture, &avpkt); -+#else - len = avcodec_decode_video (this->context, this->av_frame, - &got_picture, &chunk_buf[offset], - this->size); -- -+#endif - #ifdef AVCODEC_HAS_REORDERED_OPAQUE - /* reset consumed pts value */ - this->context->reordered_opaque = ff_tag_pts(this, 0); -@@ -1432,7 +1472,7 @@ - img->base, img->pitches, - img->width, img->height, - this->av_frame->qscale_table, this->av_frame->qstride, -- this->pp_mode, this->pp_context, -+ this->our_mode, this->our_context, - this->av_frame->pict_type); - - } else if (!this->av_frame->opaque) { -@@ -1676,11 +1716,11 @@ - free(this->buf); - this->buf = NULL; - -- if(this->pp_context) -- pp_free_context(this->pp_context); -+ if(this->our_context) -+ pp_free_context(this->our_context); - -- if(this->pp_mode) -- pp_free_mode(this->pp_mode); -+ if(this->our_mode) -+ pp_free_mode(this->our_mode); - - mpeg_parser_dispose(this->mpeg_parser); - -@@ -1721,8 +1761,8 @@ - this->aspect_ratio = 0; - - this->pp_quality = 0; -- this->pp_context = NULL; -- this->pp_mode = NULL; -+ this->our_context = NULL; -+ this->our_mode = NULL; - - this->mpeg_parser = NULL; - -diff -r 717450d734f7 src/post/planar/pp.c ---- a/src/post/planar/pp.c Mon May 16 15:49:02 2011 +0100 -+++ b/src/post/planar/pp.c Mon May 16 19:46:49 2011 -0400 -@@ -35,6 +35,12 @@ - # include <libpostproc/postprocess.h> - #endif - -+#if LIBPOSTPROC_VERSION_MAJOR < 52 -+# define pp_context pp_context_t -+# define pp_mode pp_mode_t -+# define PP_PARAMETERS_T -+#endif -+ - #define PP_STRING_SIZE 256 /* size of pp mode string (including all options) */ - - /* plugin class initialization function */ -@@ -76,14 +82,15 @@ - - /* libpostproc specific stuff */ - int pp_flags; -- pp_context_t *pp_context; -- pp_mode_t *pp_mode; -+ pp_context *our_context; -+ pp_mode *our_mode; - - pthread_mutex_t lock; - }; - - - static int set_parameters (xine_post_t *this_gen, void *param_gen) { -+#ifdef PP_PARAMETERS_T - post_plugin_pp_t *this = (post_plugin_pp_t *)this_gen; - pp_parameters_t *param = (pp_parameters_t *)param_gen; - -@@ -92,17 +99,18 @@ - memcpy( &this->params, param, sizeof(pp_parameters_t) ); - - pthread_mutex_unlock (&this->lock); -- -+#endif - return 1; - } - - static int get_parameters (xine_post_t *this_gen, void *param_gen) { -+#ifdef PP_PARAMETERS_T - post_plugin_pp_t *this = (post_plugin_pp_t *)this_gen; - pp_parameters_t *param = (pp_parameters_t *)param_gen; - - - memcpy( param, &this->params, sizeof(pp_parameters_t) ); -- -+#endif - return 1; - } - -@@ -202,8 +210,8 @@ - if(cpu_caps & MM_ACCEL_X86_3DNOW) - this->pp_flags |= PP_CPU_CAPS_3DNOW; - -- this->pp_mode = NULL; -- this->pp_context = NULL; -+ this->our_mode = NULL; -+ this->our_context = NULL; - - pthread_mutex_init (&this->lock, NULL); - -@@ -248,13 +256,13 @@ - post_plugin_pp_t *this = (post_plugin_pp_t *)this_gen; - - if (_x_post_dispose(this_gen)) { -- if(this->pp_mode) { -- pp_free_mode(this->pp_mode); -- this->pp_mode = NULL; -+ if(this->our_mode) { -+ pp_free_mode(this->our_mode); -+ this->our_mode = NULL; - } -- if(this->pp_context) { -- pp_free_context(this->pp_context); -- this->pp_context = NULL; -+ if(this->our_context) { -+ pp_free_context(this->our_context); -+ this->our_context = NULL; - } - free(this); - } -@@ -304,7 +312,7 @@ - - pthread_mutex_lock (&this->lock); - -- if( !this->pp_context || -+ if( !this->our_context || - this->frame_width != yv12_frame->width || - this->frame_height != yv12_frame->height ) { - -@@ -312,32 +320,32 @@ - this->frame_height = yv12_frame->height; - pp_flags = this->pp_flags; - -- if(this->pp_context) -- pp_free_context(this->pp_context); -+ if(this->our_context) -+ pp_free_context(this->our_context); - -- this->pp_context = pp_get_context(frame->width, frame->height, pp_flags); -+ this->our_context = pp_get_context(frame->width, frame->height, pp_flags); - -- if(this->pp_mode) { -- pp_free_mode(this->pp_mode); -- this->pp_mode = NULL; -+ if(this->our_mode) { -+ pp_free_mode(this->our_mode); -+ this->our_mode = NULL; - } - } - -- if(!this->pp_mode) -- this->pp_mode = pp_get_mode_by_name_and_quality(this->params.mode, -+ if(!this->our_mode) -+ this->our_mode = pp_get_mode_by_name_and_quality(this->params.mode, - this->params.quality); - -- if(this->pp_mode) -+ if(this->our_mode) - pp_postprocess(yv12_frame->base, yv12_frame->pitches, - out_frame->base, out_frame->pitches, - (frame->width+7)&(~7), frame->height, - NULL, 0, -- this->pp_mode, this->pp_context, -+ this->our_mode, this->our_context, - 0 /*this->av_frame->pict_type*/); - - pthread_mutex_unlock (&this->lock); - -- if(this->pp_mode) { -+ if(this->our_mode) { - skip = out_frame->draw(out_frame, stream); - _x_post_frame_copy_up(frame, out_frame); - } else { diff --git a/extra/xine-lib/xine-lib-1.1.19-xvmc.patch b/extra/xine-lib/xine-lib-1.1.19-xvmc.patch deleted file mode 100644 index bef8b0bac..000000000 --- a/extra/xine-lib/xine-lib-1.1.19-xvmc.patch +++ /dev/null @@ -1,17 +0,0 @@ -Quoting ChangeLog of X11's videoproto package: -vldXvMC.h: stop uselessly including XvMClib.h - ---- src/video_out/xxmc.h -+++ src/video_out/xxmc.h -@@ -77,10 +77,10 @@ - #include <X11/extensions/XShm.h> - #include <X11/extensions/Xv.h> - #include <X11/extensions/Xvlib.h> -+#include <X11/extensions/XvMClib.h> - #ifdef HAVE_VLDXVMC - #include <X11/extensions/vldXvMC.h> - #else -- #include <X11/extensions/XvMClib.h> - #include <X11/extensions/XvMC.h> - #endif - |