Browse Source

Updated mplayer (1.0rc1 -> 1.0rc2)

early
Christian Wiese 17 years ago
parent
commit
41dc0cf2d1
  1. 27
      multimedia/mplayer/configure.patch
  2. 6
      multimedia/mplayer/mplayer.desc
  3. 32
      multimedia/mplayer/ppc64.patch
  4. 51
      multimedia/mplayer/x11-monitor-aspect.patch

27
multimedia/mplayer/configure.patch

@ -1,27 +0,0 @@
# --- T2-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# T2 SDE: package/.../mplayer/configure.patch
# 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.
# --- T2-COPYRIGHT-NOTE-END ---
--- ./configure.vanilla 2006-05-23 21:57:34.423083500 +0200
+++ ./configure 2006-05-23 21:58:02.460835750 +0200
@@ -507,7 +507,7 @@
mingw32msvc) system_name=MINGW32 ;;
esac
# We need to convert underscores so that values like k6-2 and pentium-mmx can be passed
- host_arch=`echo $_target | cut -d '-' -f 1 | tr '_' '-'`
+ host_arch=`echo $_target | cut -d '-' -f 1`
fi
echo "Detected operating system: $system_name"

6
multimedia/mplayer/mplayer.desc

@ -3,7 +3,7 @@
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY] [COPY]
[COPY] Filename: package/.../mplayer/mplayer.desc [COPY] Filename: package/.../mplayer/mplayer.desc
[COPY] Copyright (C) 2006 The OpenSDE Project [COPY] Copyright (C) 2006 - 2008 The OpenSDE Project
[COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
[COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] Copyright (C) 1998 - 2003 Clifford Wolf
[COPY] [COPY]
@ -33,9 +33,9 @@
[L] GPL [L] GPL
[S] Beta [S] Beta
[V] 1.0rc1 [V] 1.0rc2
[P] X -----5---9 179.600 [P] X -----5---9 179.600
[D] 1951804110 MPlayer-1.0rc1.tar.bz2 http://www.mplayerhq.hu/MPlayer/releases/ [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] 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/ [D] 1728761670 font-arial-iso-8859-1.tar.bz2 http://www.mplayerhq.hu/MPlayer/releases/fonts/

32
multimedia/mplayer/ppc64.patch

@ -1,7 +1,8 @@
# --- T2-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# T2 SDE: package/.../mplayer/ppc64.patch # Filename: package/.../mplayer/ppc64.patch
# Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2006 The T2 SDE Project # Copyright (C) 2006 The T2 SDE Project
# #
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
@ -12,29 +13,28 @@
# of the GNU General Public License as published by the Free Software # 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 # Foundation; either version 2 of the License, or (at your option) any later
# version. # version.
# --- T2-COPYRIGHT-NOTE-END --- # --- SDE-COPYRIGHT-NOTE-END ---
Accept ppc64 as ppc is. Allow compilation for PPC target when using a toolchain defined as ppc64 or
powerpc64.
- Rene Rebe <rene@exactcode.de> --- MPlayer-1.0rc2/configure.orig 2007-10-07 22:49:33.000000000 +0300
+++ MPlayer-1.0rc2/configure 2008-01-06 20:22:36.000000000 +0200
--- MPlayer-1.0pre8/configure.vanilla 2006-06-16 10:30:36.000000000 +0200 @@ -139,7 +139,7 @@
+++ MPlayer-1.0pre8/configure 2006-06-16 10:32:31.000000000 +0200
@@ -135,7 +135,7 @@
ppc() { ppc() {
case "$host_arch" in case "$host_arch" in
- ppc) return 0;; - ppc|powerpc) return 0;;
+ ppc|ppc64) return 0;; + ppc|powerpc|ppc64|powerpc64) return 0;;
*) return 1;; *) return 1;;
esac esac
} }
@@ -1182,7 +1182,7 @@ @@ -2014,7 +2014,7 @@
_optimizing='' _optimizing=''
;; ;;
- ppc) - ppc|powerpc)
+ ppc|ppc64) + ppc|powerpc|ppc64|powerpc64)
_def_arch='#define ARCH_POWERPC 1' _arch='POWERPC PPC'
_def_dcbzl='#define NO_DCBZL 1' _def_dcbzl='#define NO_DCBZL 1'
_target_arch='TARGET_ARCH_POWERPC = yes' _target_arch='ARCH_POWERPC = yes'

51
multimedia/mplayer/x11-monitor-aspect.patch

@ -1,51 +0,0 @@
# --- T2-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# T2 SDE: package/.../mplayer/x11-monitor-aspect.patch
# 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.
# --- T2-COPYRIGHT-NOTE-END ---
Set the monitor aspect automatically for X displays as done by other drivers,
e.g. the OS X one. Formerly 4:3 was always assumted leading to obviously
false apsect on recent 16:9 / 16:10 desktop and laptop displays.
- Rene Rebe <rene@exactcode.de>
--- MPlayer-1.0pre7try2/libvo/x11_common.c 2005-04-16 17:52:03.000000000 +0200
+++ MPlayer-1.0pre7try2-fixed/libvo/x11_common.c 2006-02-12 19:04:15.070424750 +0100
@@ -87,6 +87,8 @@
static int vo_fs_flip = 0;
char **vo_fstype_list;
+extern float monitor_aspect;
+
/* if equal to 1 means that WM is a metacity (broken as hell) */
int metacity_hack = 0;
@@ -510,6 +512,17 @@
vo_screenwidth, vo_screenheight, depth, vo_depthonscreen,
dispName, mLocalDisplay ? "local" : "remote");
+#ifdef HAVE_XINERAMA
+ if(!XineramaIsActive(mDisplay))
+#endif
+ {
+ int w, h;
+ w = XDisplayWidthMM (mDisplay, mScreen);
+ h = XDisplayHeightMM (mDisplay, mScreen);
+ if (w && h)
+ monitor_aspect = (float) w / h;
+ }
+
vo_wm_type = vo_wm_detect();
vo_fs_type = vo_x11_get_fs_type(vo_wm_type);
Loading…
Cancel
Save