Browse Source

Mathieu Doidy:


			
			
				rocklinux
			
			
		
Mathieu 20 years ago
parent
commit
287b619770
3 changed files with 3 additions and 40 deletions
  1. +0
    -36
      package/jimmy/mplayer/devfs_path_fix.patch
  2. +1
    -1
      package/jimmy/mplayer/mplayer.conf
  3. +2
    -3
      package/jimmy/mplayer/mplayer.desc

+ 0
- 36
package/jimmy/mplayer/devfs_path_fix.patch

@ -1,36 +0,0 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/jimmy/mplayer/devfs_path_fix.patch
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
#
# This program is free software; you can redistribute it and/or modify
# it 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. A copy of the GNU General Public
# License can be found at Documentation/COPYING.
#
# Many people helped and are helping developing ROCK Linux. Please
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
# file for details.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
diff -ru MPlayer-1.0pre4.old/mplayer.c MPlayer-1.0pre4/mplayer.c
--- MPlayer-1.0pre4.old/mplayer.c 2004-04-26 23:15:13.000000000 +0200
+++ MPlayer-1.0pre4/mplayer.c 2004-04-28 12:48:15.000000000 +0200
@@ -1088,8 +1088,8 @@
if(!nortc)
{
// seteuid(0); /* Can't hurt to try to get root here */
- if ((rtc_fd = open("/dev/rtc", O_RDONLY)) < 0)
- mp_msg(MSGT_CPLAYER, MSGL_WARN, "Failed to open /dev/rtc: %s (/dev/rtc should be readable by the user.)\n", strerror(errno));
+ if ((rtc_fd = open("/dev/misc/rtc", O_RDONLY)) < 0)
+ mp_msg(MSGT_CPLAYER, MSGL_WARN, "Failed to open /dev/misc/rtc: %s (/dev/misc/rtc should be readable by the user.)\n", strerror(errno));
else {
unsigned long irqp = 1024; /* 512 seemed OK. 128 is jerky. */

+ 1
- 1
package/jimmy/mplayer/mplayer.conf

@ -51,6 +51,7 @@ mplayer_postmake() {
framedrop=yes
menu=yes
rtc-device=/dev/misc/rtc
# vop=pp
# autoq=6
EOT
@ -88,6 +89,5 @@ pkginstalled xmms && var_append confopt " " "--enable-xmms"
pkginstalled gtk+12 && var_append confopt " " "--enable-gui"
test "$ROCKCFG_DISABLE_NLS" = 0 || var_append confopt " " "--disable-i18n"
hook_add preconf 3 "patch -fp0 < $archdir/vuln04-fix.diff"
hook_add premake 3 mplayer_premake
hook_add postmake 5 mplayer_postmake

+ 2
- 3
package/jimmy/mplayer/mplayer.desc

@ -40,10 +40,9 @@
[L] GPL
[S] Beta
[V] 1.0pre4
[V] 1.0pre5
[P] X -----5---9 179.600
[D] 1958268145 MPlayer-1.0pre4.tar.bz2 http://www.mplayerhq.hu/MPlayer/releases/
[D] 546727829 MPlayer-1.0pre5.tar.bz2 http://www.mplayerhq.hu/MPlayer/releases/
[D] 1060223231 default-1.7.tar.bz2 http://www.mplayerhq.hu/MPlayer/Skin/
[D] 1043513727 font-arial-iso-8859-1.tar.bz2 http://www.mplayerhq.hu/MPlayer/releases/fonts/
[D] 2459204124 vuln04-fix.diff http://www.mplayerhq.hu/MPlayer/patches/

Loading…
Cancel
Save