diff --git a/multimedia/mplayer/mplayer.conf b/multimedia/mplayer/mplayer.conf index bc7165679..353677ac6 100644 --- a/multimedia/mplayer/mplayer.conf +++ b/multimedia/mplayer/mplayer.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../mplayer/mplayer.conf -# Copyright (C) 2006 - 2008 The OpenSDE Project +# Copyright (C) 2006 - 2010 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -98,9 +98,6 @@ if pkginstalled bio2jack; then var_append confopt " " "--enable-jack" var_append GCC_WRAPPER_APPEND " " "-ljack" fi -if pkginstalled directfb; then - var_append confopt " " "--enable-directfb" -fi var_append confopt " " "--enable-tv-v4l2" var_append confopt " " "--enable-tv-v4l" @@ -110,3 +107,5 @@ test "$SDECFG_DISABLE_NLS" = 0 || var_append confopt " " "--disable-i18n" var_append confopt ' ' "--libdir=$root/$libdir" hook_add postmake 5 mplayer_postmake + +var_append GCC_WRAPPER_APPEND ' ' '-std=gnu99' diff --git a/multimedia/mplayer/mplayer.desc b/multimedia/mplayer/mplayer.desc index 21b41b2cb..f73fdacca 100644 --- a/multimedia/mplayer/mplayer.desc +++ b/multimedia/mplayer/mplayer.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../mplayer/mplayer.desc -[COPY] Copyright (C) 2006 - 2009 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2010 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] @@ -32,10 +32,10 @@ [L] GPL [S] Beta -[V] 2009-03-23 +[V] 1.0-20101123 [P] X -----5---9 179.600 -[D] X mplayer-2009-03-23.tar.bz2 svn://svn.mplayerhq.hu/mplayer/trunk mplayer -r {2009-03-23} +[D] X mplayer-20101123.tar.bz2 svn://svn.mplayerhq.hu/mplayer/trunk mplayer -r {2010-11-23} #[D] 38036116 MPlayer-1.0rc2.tar.bz2 http://www.mplayerhq.hu/MPlayer/releases/ [D] 319348111 Blue-1.7.tar.bz2 http://www.mplayerhq.hu/MPlayer/Skin/ [D] 1728761670 font-arial-iso-8859-1.tar.bz2 http://www.mplayerhq.hu/MPlayer/releases/fonts/ diff --git a/multimedia/mplayer/vf-crop-relative.patch b/multimedia/mplayer/vf-crop-relative.patch deleted file mode 100644 index b0f5403ad..000000000 --- a/multimedia/mplayer/vf-crop-relative.patch +++ /dev/null @@ -1,69 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../mplayer/vf-crop-relative.patch -# Copyright (C) 2008 The OpenSDE Project -# Copyright (C) 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -It got on my nerves for some time that I have to compute the resulting width and -height manually all the itme - a task screaming for a computer. Also just -cutting off the overscan noise usually on DVB broadcasts requires multiple -parameter sets depending on the actual broadcast format (e.g. classic 4:3 -vs. a real (black border-less) 16:9) transmission). - -Allow relative cuts using negative values, e.g. crop="20:82:-20:-82". - - - Rene Rebe - ---- MPlayer-1.0pre7try2/libmpcodecs/vf_crop.c 2003-05-20 19:42:33.000000000 +0200 -+++ MPlayer-1.0pre7try2-fixed/libmpcodecs/vf_crop.c 2006-02-13 13:35:19.927524500 +0100 -@@ -28,9 +28,13 @@ - static int config(struct vf_instance_s* vf, - int width, int height, int d_width, int d_height, - unsigned int flags, unsigned int outfmt){ -+ if (vf->priv->crop_w < 0) -+ vf->priv->crop_w = width + vf->priv->crop_w; -+ if (vf->priv->crop_h < 0) -+ vf->priv->crop_h = height + vf->priv->crop_h; - // calculate the missing parameters: -- if(vf->priv->crop_w<=0 || vf->priv->crop_w>width) vf->priv->crop_w=width; -- if(vf->priv->crop_h<=0 || vf->priv->crop_h>height) vf->priv->crop_h=height; -+ if(vf->priv->crop_w>width) vf->priv->crop_w=width; -+ if(vf->priv->crop_h>height) vf->priv->crop_h=height; - if(vf->priv->crop_x<0) vf->priv->crop_x=(width-vf->priv->crop_w)/2; - if(vf->priv->crop_y<0) vf->priv->crop_y=(height-vf->priv->crop_h)/2; - // rounding: -@@ -156,7 +163,7 @@ - &vf->priv->crop_h, - &vf->priv->crop_x, - &vf->priv->crop_y); -- mp_msg(MSGT_VFILTER, MSGL_INFO, "Crop: %d x %d, %d ; %d\n", -+ mp_msg(MSGT_VFILTER, MSGL_INFO, "Crop: %d x %d @%d,%d\n", - vf->priv->crop_w, - vf->priv->crop_h, - vf->priv->crop_x, -@@ -166,10 +173,10 @@ - - #define ST_OFF(f) M_ST_OFF(struct vf_priv_s,f) - static const m_option_t vf_opts_fields[] = { -- {"w", ST_OFF(crop_w), CONF_TYPE_INT, M_OPT_MIN,0 ,0, NULL}, -- {"h", ST_OFF(crop_h), CONF_TYPE_INT, M_OPT_MIN,0 ,0, NULL}, -- {"x", ST_OFF(crop_x), CONF_TYPE_INT, M_OPT_MIN,-1 ,0, NULL}, -- {"y", ST_OFF(crop_y), CONF_TYPE_INT, M_OPT_MIN,-1 ,0, NULL}, -+ {"w", ST_OFF(crop_w), CONF_TYPE_INT, 0, 0, 0, NULL}, -+ {"h", ST_OFF(crop_h), CONF_TYPE_INT, 0, 0, 0, NULL}, -+ {"x", ST_OFF(crop_x), CONF_TYPE_INT, M_OPT_MIN, -1, 0, NULL}, -+ {"y", ST_OFF(crop_y), CONF_TYPE_INT, M_OPT_MIN, -1, 0, NULL}, - { NULL, NULL, 0, 0, 0, 0, NULL } - }; -