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-2005 09:14:49
  Branch: HEAD                             Handle: 2005101508144900

  Added files:
    openpkg-src/lame        lame.patch
  Modified files:
    openpkg-src/lame        lame.spec

  Log:
    fix building under Solaris

  Summary:
    Revision    Changes     Path
    1.1         +28 -0      openpkg-src/lame/lame.patch
    1.44        +5  -2      openpkg-src/lame/lame.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/lame/lame.patch
  ============================================================================
  $ cvs diff -u -r0 -r1.1 lame.patch
  --- /dev/null 2005-10-15 09:14:45 +0200
  +++ lame.patch        2005-10-15 09:14:49 +0200
  @@ -0,0 +1,28 @@
  +Index: frontend/brhist.c
  +--- frontend/brhist.c.orig   2005-02-25 01:21:54.000000000 +0000
  ++++ frontend/brhist.c        2005-10-15 07:10:02.360103324 +0000
  +@@ -422,7 +422,7 @@
  + void
  + brhist_disp(const lame_global_flags * gf)
  + {
  +-    int     i, lines = 0;
  ++    int     i, xlines = 0;
  +     int     br_hist[BRHIST_WIDTH]; /* how often a frame size was used */
  +     int     br_sm_hist[BRHIST_WIDTH][4]; /* how often a special frame 
size/stereo mode commbination was used */
  +     int     st_mode[4];
  +@@ -449,13 +449,13 @@
  +         if (most_often < br_hist[i])
  +             most_often = br_hist[i];
  +         if (br_hist[i])
  +-            ++lines;
  ++            ++xlines;
  +     }
  + 
  +     for (i = 0; i < BRHIST_WIDTH; i++) {
  +         int     show = br_hist[i];
  + #ifdef RH_HIST
  +-        show = show && (lines > 1);
  ++        show = show && (xlines > 1);
  + #endif
  +         if (show || (i >= brhist.vbr_bitrate_min_index && i <= 
brhist.vbr_bitrate_max_index))
  +             brhist_disp_line(gf, i, br_hist[i], br_sm_hist[i][LR], 
most_often, frames);
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/lame/lame.spec
  ============================================================================
  $ cvs diff -u -r1.43 -r1.44 lame.spec
  --- openpkg-src/lame/lame.spec        14 Oct 2005 14:20:01 -0000      1.43
  +++ openpkg-src/lame/lame.spec        15 Oct 2005 07:14:49 -0000      1.44
  @@ -37,10 +37,11 @@
   Group:        Audio
   License:      GPL
   Version:      %{V_real}
  -Release:      20051014
  +Release:      20051015
   
   #   list of sources
   Source0:      
http://osdn.dl.sourceforge.net/sourceforge/lame/lame-%{V_real}.tar.gz
  +Patch0:       lame.patch
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -70,7 +71,9 @@
   
   %prep
       %setup -q -n lame-%{V_logic}
  -    ln -s acm ACM
  +    %patch -p0
  +    mv acm ACM
  +    ln -s ACM acm
   
   %build
       CC="%{l_cc}" \
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to