[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openpkg-cvs
Subject:    [CVS] OpenPKG: openpkg-src/mplayer/ live.patch mplayer.patch mplayer.s...
From:       "Ralf S. Engelschall" <rse () openpkg ! org>
Date:       2003-08-30 12:48:02
[Download RAW message or body]

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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  rse@openpkg.org
  Module: openpkg-src openpkg-web          Date:   30-Aug-2003 14:48:02
  Branch: HEAD                             Handle: 2003083013480001

  Modified files:
    openpkg-src/mplayer     mplayer.patch mplayer.spec
    openpkg-web             news.txt
  Removed files:
    openpkg-src/mplayer     live.patch

  Log:
    speclint police: merge with mplayer.patch

  Summary:
    Revision    Changes     Path
    1.3         +0  -39     openpkg-src/mplayer/live.patch
    1.3         +39 -0      openpkg-src/mplayer/mplayer.patch
    1.20        +1  -3      openpkg-src/mplayer/mplayer.spec
    1.6343      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  rm -f openpkg-src/mplayer/live.patch <<'@@ .'
  Index: openpkg-src/mplayer/live.patch
  ============================================================================
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/mplayer/mplayer.patch
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 mplayer.patch
  --- openpkg-src/mplayer/mplayer.patch	11 Aug 2003 09:38:47 -0000	1.2
  +++ openpkg-src/mplayer/mplayer.patch	30 Aug 2003 12:48:01 -0000	1.3
  @@ -203,3 +203,42 @@
    #CFLAGS=-I. -I.. -O $(WARN_FLAGS) -g #-fno-omit-frame-pointer
    
    all: libloader.a
  +diff -Naur live.orig/config.solaris live/config.solaris
  +--- live.orig/config.solaris	2003-08-07 09:52:11.000000000 +0200
  ++++ live/config.solaris	2003-08-13 18:31:12.542868000 +0200
  +@@ -1,4 +1,4 @@
  +-COMPILE_OPTS =		$(INCLUDES) -I. -O -DSOLARIS
  ++COMPILE_OPTS =		$(INCLUDES) -I. -O -DSOLARIS -DSOCKLEN_T=socklen_t
  + C =			c
  + C_COMPILER =		cc
  + C_FLAGS =		$(COMPILE_OPTS)
  +diff -Naur live.orig/groupsock/Groupsock.cpp live/groupsock/Groupsock.cpp
  +--- live.orig/groupsock/Groupsock.cpp	Thu Aug  7 09:52:09 2003
  ++++ live/groupsock/Groupsock.cpp	Wed Aug 13 14:59:36 2003
  +@@ -24,9 +24,9 @@
  + #include "TunnelEncaps.hh"
  + 
  + #if defined(__WIN32__) || defined(_WIN32)
  +-#include <strstrea.h>
  ++#include <strstrea>
  + #else
  +-#include <strstream.h>
  ++#include <strstream>
  + #endif
  + #include <stdio.h>
  + 
  +diff -Naur live.orig/groupsock/NetInterface.cpp live/groupsock/NetInterface.cpp
  +--- live.orig/groupsock/NetInterface.cpp	Thu Aug  7 09:52:09 2003
  ++++ live/groupsock/NetInterface.cpp	Wed Aug 13 15:00:00 2003
  +@@ -22,9 +22,9 @@
  + #include "GroupsockHelper.hh"
  + 
  + #if defined(__WIN32__) || defined(_WIN32)
  +-#include <strstrea.h>
  ++#include <strstrea>
  + #else
  +-#include <strstream.h>
  ++#include <strstream>
  + #endif
  + 
  + ////////// NetInterface //////////
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/mplayer/mplayer.spec
  ============================================================================
  $ cvs diff -u -r1.19 -r1.20 mplayer.spec
  --- openpkg-src/mplayer/mplayer.spec	14 Aug 2003 12:13:14 -0000	1.19
  +++ openpkg-src/mplayer/mplayer.spec	30 Aug 2003 12:48:01 -0000	1.20
  @@ -38,7 +38,7 @@
   Group:        Video
   License:      GPL and others
   Version:      %{V_mplayer}
  -Release:      20030814
  +Release:      20030830
   
   #   build options
   %option       with_gui    no
  @@ -52,7 +52,6 @@
   Source4:      ftp://ftp.mplayerhq.hu/MPlayer/Skin/Blue-%{V_blue}.tar.bz2
   Source5:      http://www.live.com/liveMedia/public/live.%{V_live}.tar.gz
   Patch0:       mplayer.patch
  -Patch1:       live.patch
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -79,7 +78,6 @@
       %setup0 -q -n MPlayer-%{V_mplayer}
       %setup5 -q -n MPlayer-%{V_mplayer} -T -D -a 5
       %patch0 -p0
  -    %patch1 -p0
       %{l_shtool} subst \
           -e 's;u_int\([0-9]*\)_t;uint\1_t;g' \
           live/groupsock/include/NetAddress.hh \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.6342 -r1.6343 news.txt
  --- openpkg-web/news.txt	30 Aug 2003 08:19:19 -0000	1.6342
  +++ openpkg-web/news.txt	30 Aug 2003 12:48:00 -0000	1.6343
  @@ -1,3 +1,4 @@
  +30-Aug-2003: Upgraded package: P<mplayer-0.91-20030830>
   30-Aug-2003: Upgraded package: P<fping-2.4b2to-20030830>
   30-Aug-2003: Upgraded package: P<dhcpd-3.0.1rc12-20030830>
   30-Aug-2003: Upgraded package: P<bogofilter-0.15.0-20030830>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org
[prev in list] [next in list] [prev in thread] [next in thread]