OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   15-Oct-2006 16:50:45
  Branch: HEAD                             Handle: 2006101515504500

  Modified files:
    openpkg-src/mplayer     mplayer.spec

  Log:
    integrate more themes. Taken over from Michael Schloh's patch set

  Summary:
    Revision    Changes     Path
    1.158       +59 -7      openpkg-src/mplayer/mplayer.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/mplayer/mplayer.spec
  ============================================================================
  $ cvs diff -u -r1.157 -r1.158 mplayer.spec
  --- openpkg-src/mplayer/mplayer.spec  14 Oct 2006 07:42:57 -0000      1.157
  +++ openpkg-src/mplayer/mplayer.spec  15 Oct 2006 14:50:45 -0000      1.158
  @@ -26,7 +26,13 @@
   %define       V_mplayer          1.0pre8
   %define       V_codecs_essential 20060611
   %define       V_codecs_quicktime 20040704
  -%define       V_skin_blue        1.6
  +%define       V_skin_blue        1.4
  +%define       V_skin_dvdplayer   1.1
  +%define       V_skin_industrial  1.0
  +%define       V_skin_osxbrushed  2.3
  +%define       V_skin_orange      1.3
  +%define       V_skin_powerplayer 1.1
  +%define       V_skin_proton      1.2
   %define       V_extension_live   2006.10.12a
   
   #   package information
  @@ -40,7 +46,7 @@
   Group:        Video
   License:      GPL and others
   Version:      %{V_mplayer}
  -Release:      20061014
  +Release:      20061015
   
   #   build options
   %option       with_gui    yes
  @@ -51,7 +57,13 @@
   Source1:      
ftp://ftp2.mplayerhq.hu/MPlayer/releases/codecs/windows-essential-%{V_codecs_essential}.zip
   Source2:      
ftp://ftp2.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
   Source3:      
ftp://ftp2.mplayerhq.hu/MPlayer/Skin/Blue-%{V_skin_blue}.tar.bz2
  -Source4:      
http://www.live555.com/liveMedia/public/live.%{V_extension_live}.tar.gz
  +Source4:      
ftp://ftp2.mplayerhq.hu/MPlayer/Skin/DVDPlayer-%{V_skin_dvdplayer}.tar.bz2
  +Source5:      
ftp://ftp2.mplayerhq.hu/MPlayer/Skin/Industrial-%{V_skin_industrial}.tar.bz2
  +Source6:      
ftp://ftp2.mplayerhq.hu/MPlayer/Skin/OSX-Brushed-%{V_skin_osxbrushed}.tar.bz2
  +Source7:      
ftp://ftp2.mplayerhq.hu/MPlayer/Skin/Orange-%{V_skin_orange}.tar.bz2
  +Source8:      
ftp://ftp2.mplayerhq.hu/MPlayer/Skin/PowerPlayer-%{V_skin_powerplayer}.tar.bz2
  +Source9:      
ftp://ftp2.mplayerhq.hu/MPlayer/Skin/proton-%{V_skin_proton}.tar.bz2
  +Source10:     
http://www.live555.com/liveMedia/public/live.%{V_extension_live}.tar.gz
   Patch0:       mplayer.patch
   
   #   build information
  @@ -59,8 +71,10 @@
   BuildRoot:    %{l_buildroot}
   BuildPreReq:  OpenPKG, openpkg >= 20040130, X11, gcc3, make, sed
   PreReq:       OpenPKG, openpkg >= 20040130, X11
  -BuildPreReq:  zlib, libiconv, sdl, freetype, jpeg, png, vorbis-libs, lzo, 
libsmbclient, aalib
  -PreReq:       zlib, libiconv, sdl, freetype, jpeg, png, vorbis-libs, lzo, 
libsmbclient, aalib
  +BuildPreReq:  zlib, libiconv, sdl, freetype, jpeg, png
  +PreReq:       zlib, libiconv, sdl, freetype, jpeg, png
  +BuildPreReq:  lame, vorbis-libs, lzo, libsmbclient, aalib
  +PreReq:       lame, vorbis-libs, lzo, libsmbclient, aalib
   %if "%{with_gui}" == "yes"
   BuildPreReq:  glib, gtk
   PreReq:       glib, gtk
  @@ -91,6 +105,36 @@
           url       = ftp://ftp2.mplayerhq.hu/MPlayer/Skin/
           regex     = Blue-(__VER__)\.tar\.bz2
       }
  +    prog mplayer:skin_dvdplayer = {
  +        version   = %{V_skin_dvdplayer}
  +        url       = ftp://ftp2.mplayerhq.hu/MPlayer/Skin/
  +        regex     = DVDPlayer-(__VER__)\.tar\.bz2
  +    }
  +    prog mplayer:skin_industrial = {
  +        version   = %{V_skin_industrial}
  +        url       = ftp://ftp2.mplayerhq.hu/MPlayer/Skin/
  +        regex     = Industrial-(__VER__)\.tar\.bz2
  +    }
  +    prog mplayer:skin_osxbrushed = {
  +        version   = %{V_skin_osxbrushed}
  +        url       = ftp://ftp2.mplayerhq.hu/MPlayer/Skin/
  +        regex     = OSX-Brushed-(__VER__)\.tar\.bz2
  +    }
  +    prog mplayer:skin_orange = {
  +        version   = %{V_skin_orange}
  +        url       = ftp://ftp2.mplayerhq.hu/MPlayer/Skin/
  +        regex     = Orange-(__VER__)\.tar\.bz2
  +    }
  +    prog mplayer:skin_powerplayer = {
  +        version   = %{V_skin_powerplayer}
  +        url       = ftp://ftp2.mplayerhq.hu/MPlayer/Skin/
  +        regex     = PowerPlayer-(__VER__)\.tar\.bz2
  +    }
  +    prog mplayer:skin_proton = {
  +        version   = %{V_skin_proton}
  +        url       = ftp://ftp2.mplayerhq.hu/MPlayer/Skin/
  +        regex     = proton-(__VER__)\.tar\.bz2
  +    }
       prog mplayer:extension_live = {
           version   = %{V_extension_live}
           url       = http://www.live555.com/liveMedia/public/
  @@ -99,7 +143,7 @@
   
   %prep
       %setup -q -n MPlayer-%{V_mplayer}
  -    %setup -q -n MPlayer-%{V_mplayer} -T -D -a 4
  +    %setup -q -n MPlayer-%{V_mplayer} -T -D -a 10
       %patch -p0
       %{l_shtool} subst \
           -e 's; *-I/usr/local/include/*[a-zA-Z0-9{},/ ]*;;g' \
  @@ -163,6 +207,8 @@
   %else
           --disable-win32 \
   %endif
  +        --disable-libavcodec \
  +        --disable-libavformat \
           --disable-gcc-checking \
           --enable-largefiles \
           --enable-live \
  @@ -250,9 +296,15 @@
           $RPM_BUILD_ROOT%{l_prefix}/etc/mplayer/
   
   %if "%{with_gui}" == "yes"
  -    #   install a default skin
  +    #   install a default skin and several others
       ( cd $RPM_BUILD_ROOT%{l_prefix}/share/mplayer/Skin
         %{l_bzip2} -dc %{SOURCE Blue-%{V_skin_blue}.tar.bz2} | %{l_tar} -xvf -
  +      %{l_bzip2} -dc %{SOURCE DVDPlayer-%{V_skin_dvdplayer}.tar.bz2} | 
%{l_tar} -xvf -
  +      %{l_bzip2} -dc %{SOURCE Industrial-%{V_skin_industrial}.tar.bz2} | 
%{l_tar} -xvf -
  +      %{l_bzip2} -dc %{SOURCE OSX-Brushed-%{V_skin_osxbrushed}.tar.bz2} | 
%{l_tar} -xvf -
  +      %{l_bzip2} -dc %{SOURCE Orange-%{V_skin_orange}.tar.bz2} | %{l_tar} 
-xvf -
  +      %{l_bzip2} -dc %{SOURCE PowerPlayer-%{V_skin_powerplayer}.tar.bz2} | 
%{l_tar} -xvf -
  +      %{l_bzip2} -dc %{SOURCE proton-%{V_skin_proton}.tar.bz2} | %{l_tar} 
-xvf -
         %{l_shtool} mkln -s -f Blue default
       ) || exit $?
   %endif
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to