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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   29-Aug-2004 10:57:42
  Branch: HEAD                             Handle: 2004082909574100

  Modified files:
    openpkg-src/mozilla-mplayer
                            mozilla-mplayer.spec

  Log:
    well, linking against a pre-built Linux-only Gecko SDK certainly will
    lead to segfaults, of course. Repair this package by finally using the
    correct SDK provided by enhanced Mozilla package

  Summary:
    Revision    Changes     Path
    1.16        +31 -20     openpkg-src/mozilla-mplayer/mozilla-mplayer.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/mozilla-mplayer/mozilla-mplayer.spec
  ============================================================================
  $ cvs diff -u -r1.15 -r1.16 mozilla-mplayer.spec
  --- openpkg-src/mozilla-mplayer/mozilla-mplayer.spec  29 Aug 2004 07:33:18 -0000     
 1.15
  +++ openpkg-src/mozilla-mplayer/mozilla-mplayer.spec  29 Aug 2004 08:57:41 -0000     
 1.16
  @@ -23,11 +23,6 @@
   ##  SUCH DAMAGE.
   ##
   
  -#   FIXME: tho: segfaults during runtime
  -
  -#   versions of individual parts
  -%define       V_gecko_sdk        1.7.2
  -
   #   package information
   Name:         mozilla-mplayer
   Summary:      Mozilla MPlayer Plugin
  @@ -43,13 +38,14 @@
   
   #   list of sources
   Source0:      
http://osdn.dl.sourceforge.net/mplayerplug-in/mplayerplug-in-%{version}.tar.gz
  -Source1:      
ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla%{V_gecko_sdk}/gecko-sdk-i686-pc-linux-gnu-%{V_gecko_sdk}.tar.gz
   
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130, X11, gcc
  -PreReq:       OpenPKG, openpkg >= 20040130, X11, mozilla, mplayer
  +BuildPreReq:  OpenPKG, openpkg >= 20040130, gcc
  +PreReq:       OpenPKG, openpkg >= 20040130, mplayer
  +BuildPreReq:  X11, mozilla, mozilla::with_sdk = yes
  +PreReq:       X11, mozilla, mozilla::with_sdk = yes
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -64,25 +60,35 @@
           url       = http://prdownloads.sourceforge.net/mplayerplug-in/
           regex     = mplayerplug-in-(__VER__)\.tar\.gz
       }
  -    prog mozilla-mplaer:gecko-sdk = {
  -        version   = %{V_gecko_sdk}
  -        url       = http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/
  -        regex     = mozilla\.\*/gecko-sdk-i686-pc-linux-gnu-(__VER__)\.tar\.gz
  -    }
   
   %prep
       %setup -q -n mplayerplug-in
  -    %setup -q -n mplayerplug-in -a 1
       %{l_shtool} subst \
           -e '/\/etc\/mplayerplug/s;/etc;%{l_prefix}/etc/mozilla-mplayer;' \
           Source/plugin-setup.cpp
   
   %build
  -    CC="%{l_cc}" \
  -    CPPFLAGS="%{l_cppflags} -I`%{l_prefix}/etc/rc --query x11_incdir`" \
  -    CFLAGS="%{l_cflags -O} %{l_cppflags} -I`%{l_prefix}/etc/rc --query x11_incdir`" 
\
  -    CPPFLAGS="%{l_cppflags} -I`%{l_prefix}/etc/rc --query x11_incdir`" \
  -    LIBS="%{l_ldflags} -L`%{l_prefix}/etc/rc --query x11_libdir`" \
  +    #   determine standard build flags
  +    export CC="%{l_cc}"
  +    export CPPFLAGS="%{l_cppflags}"
  +    export CFLAGS="%{l_cflags -O} %{l_cppflags}"
  +    export LDFLAGS="%{l_ldflags}"
  +    export LIBS="%{l_ldflags}"
  +
  +    #   determine additional X11 build flags
  +    CPPFLAGS="$CPPFLAGS -I`%{l_prefix}/etc/rc --query x11_incdir`"
  +    CFLAGS="$CFLAGS -I`%{l_prefix}/etc/rc --query x11_incdir`"
  +    LDFLAGS="$LDFLAGS -L`%{l_prefix}/etc/rc --query x11_libdir`"
  +    LIBS="$LIBS -L`%{l_prefix}/etc/rc --query x11_libdir`"
  +
  +    #   determine additional Mozilla build flags
  +    CPPFLAGS="$CPPFLAGS `pkg-config mozilla-plugin --cflags-only-I`"
  +    CFLAGS="$CFLAGS `pkg-config mozilla-plugin --cflags-only-other`"
  +    LDFLAGS="$LDFLAGS `pkg-config mozilla-plugin --libs-only-L`"
  +    LIBS="$LIBS `pkg-config mozilla-plugin --libs-only-other`"
  +    LIBS="$LIBS %{l_ldflags mozilla}"
  +
  +    #   configure plugin
       ./configure \
           --prefix=%{l_prefix} \
           --with-x \
  @@ -90,10 +96,13 @@
           --x-libraries=`%{l_prefix}/etc/rc --query x11_libdir` \
           --disable-gtk2 \
           --enable-gtk1 \
  -        --with-gecko-sdk=./gecko-sdk
  +        --with-gecko-sdk=%{l_prefix}/lib/mozilla
  +
  +    #   build plugin
       %{l_make} %{l_mflags}
   
   %install
  +    #   install plugin
       rm -rf $RPM_BUILD_ROOT
       %{l_shtool} mkdir -f -p -m 755 \
           $RPM_BUILD_ROOT%{l_prefix}/etc/mozilla-mplayer \
  @@ -103,6 +112,8 @@
       %{l_shtool} install -c -m 644 \
           mplayerplug-in.conf mplayerplug-in.types \
           $RPM_BUILD_ROOT%{l_prefix}/etc/mozilla-mplayer/
  +
  +    #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%config %{l_prefix}/etc/mozilla-mplayer/*' \
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to