Fix for SDL-1.2.5 it now has SDL postpended to the library path. I just rip it of...

diff --git a/configure b/configure
index 2594ee963726910be3ae4edd4c842b85cf05cc8b..6e199ec84dce8eb1e696abdf5ef65f7bc437ec90 100755 (executable)
--- a/configure
+++ b/configure
@@ -12291,7 +12291,7 @@ fi;
   if test x${SDL_CONFIG} != xno
   then
     PLUGINS="${PLUGINS} sdl"
-    sdl_CFLAGS="${sdl_CFLAGS} `${SDL_CONFIG} ${SDL_PREFIX} --cflags`"
+    sdl_CFLAGS="${sdl_CFLAGS} `${SDL_CONFIG} ${SDL_PREFIX} --cflags | sed 's,SDL,,'`"
     sdl_LDFLAGS="${sdl_LDFLAGS} `${SDL_CONFIG} ${SDL_PREFIX} --libs | sed 's,-rdynamic,,'`"
     CPPFLAGS="$save_CPPFLAGS $sdl_CFLAGS"
 
@@ -14413,23 +14413,25 @@ if test "${enable_opie+set}" = set; then
   enableval="$enable_opie"
   if test "x${enable_opie}" = "xyes"; then
 
+
 # Check whether --with-qte or --without-qte was given.
 if test "${with_qte+set}" = set; then
   withval="$with_qte"
 
 fi;
-     if test "x${with_qte}" != "xno"
+     if test "x${with_qte}" != "xno" -a "x${with_qte}" != "x"
      then
-       test_LDFLAGS="-L${with_qte}/lib"
-       test_CFLAGS="-I${with_qte}/include"
+       test_LDFLAGS="-L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'`"
+       test_CFLAGS="-I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'`"
      else
-       test_LDFLAGS="-L${QTDIR}/lib"
-       test_CFLAGS="-I${QTDIR}/include"
+       test_LDFLAGS="-L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'`"
+       test_CFLAGS="-I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'`"
      fi
-     ac_cv_qte_headers=yes
      CPPFLAGS="${save_CPPFLAGS} ${test_CFLAGS}"
+     ac_cv_qte_headers=yes
 
-for ac_header in qte.h
+
+for ac_header in qt.h jpeglib.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -14538,21 +14540,24 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
-       test_CFLAGS="${test_CFLAGS} -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti"
-       test_LDFLAGS="${test_LDFLAGS} -lqpe -lqte"
-
 else
-   ac_cv_qte_headers=no
-         { { echo "$as_me:$LINENO: error: echo \"Cannot find QT Embedded development headers.\"" >&5
+
+       ac_cv_qte_headers=no
+       { { echo "$as_me:$LINENO: error: echo \"Cannot find QT Embedded development headers.\"" >&5
 echo "$as_me: error: echo \"Cannot find QT Embedded development headers.\"" >&2;}
    { (exit 1); exit 1; }; }
 
-
 fi
 
 done
 
+     if test "x${ac_cv_qte_headers}" = "xyes"
+     then
+       qte_CFLAGS="${qte_CFLAGS} ${test_CFLAGS} -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti"
+       qte_LDFLAGS="${qte_LDFLAGS} ${test_LDFLAGS} -lqpe -ljpeg -lqte"
+     fi
      CPPFLAGS="${save_CPPFLAGS}"
+
      if test x${ac_cv_qte_headers} = "xyes"
      then
        PLUGINS="${PLUGINS} opie"

diff --git a/configure.in b/configure.in
index fc8e6eb91ca63c31bd14617744e817198d9cf3c5..02e6dc46f860058e08d722680d2e31135999cddf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1196,7 +1196,7 @@ then
   if test x${SDL_CONFIG} != xno
   then
     PLUGINS="${PLUGINS} sdl"
-    sdl_CFLAGS="${sdl_CFLAGS} `${SDL_CONFIG} ${SDL_PREFIX} --cflags`"
+    sdl_CFLAGS="${sdl_CFLAGS} `${SDL_CONFIG} ${SDL_PREFIX} --cflags | sed 's,SDL,,'`"
     sdl_LDFLAGS="${sdl_LDFLAGS} `${SDL_CONFIG} ${SDL_PREFIX} --libs | sed 's,-rdynamic,,'`"
     CPPFLAGS="$save_CPPFLAGS $sdl_CFLAGS"
     AC_CHECK_HEADERS(${SDL_HEADER}, AC_DEFINE_UNQUOTED(SDL_INCLUDE_FILE,
@@ -1640,28 +1640,31 @@ dnl
 AC_ARG_ENABLE(opie,
   [  --enable-opie           Qt embedded interface support (default disabled)],
   [if test "x${enable_opie}" = "xyes"; then
+
      AC_ARG_WITH(qte,
-  [    --with-qte=PATH       Qt Embedded headers and libraries])
-     if test "x${with_qte}" != "xno"
+     [    --with-qte=PATH       Qt Embedded headers and libraries])
+     if test "x${with_qte}" != "xno" -a "x${with_qte}" != "x"
      then
-       test_LDFLAGS="-L${with_qte}/lib"
-       test_CFLAGS="-I${with_qte}/include"
+       test_LDFLAGS="-L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'`"
+       test_CFLAGS="-I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'`"
      else
-       test_LDFLAGS="-L${QTDIR}/lib"
-       test_CFLAGS="-I${QTDIR}/include"
+       test_LDFLAGS="-L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'`"
+       test_CFLAGS="-I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'`"
      fi
-     ac_cv_qte_headers=yes
      CPPFLAGS="${save_CPPFLAGS} ${test_CFLAGS}"
-     AC_CHECK_HEADERS(qte.h, [
-       test_CFLAGS="${test_CFLAGS} -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti"
-       test_LDFLAGS="${test_LDFLAGS} -lqpe -lqte"
-       ],
-       [ ac_cv_qte_headers=no
-         AC_MSG_ERROR([echo "Cannot find QT Embedded development headers."]) 
-       ] 
-     )
+     ac_cv_qte_headers=yes
+     AC_CHECK_HEADERS(qt.h jpeglib.h, ,[
+       ac_cv_qte_headers=no
+       AC_MSG_ERROR([echo "Cannot find QT Embedded development headers."])
+     ] )
+     if test "x${ac_cv_qte_headers}" = "xyes"
+     then
+       qte_CFLAGS="${qte_CFLAGS} ${test_CFLAGS} -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti"
+       qte_LDFLAGS="${qte_LDFLAGS} ${test_LDFLAGS} -lqpe -ljpeg -lqte"
+     fi
      CPPFLAGS="${save_CPPFLAGS}"
-     if test x${ac_cv_qte_headers} = "xyes" 
+
+     if test x${ac_cv_qte_headers} = "xyes"
      then
        PLUGINS="${PLUGINS} opie"
        opie_LDFLAGS="${opie_LDFLAGS} ${test_LDFLAGS}"

diff --git a/ipkg/control.opie b/ipkg/control.opie
index 338a8cc6f59fe178c7b4a2c991667755e4b8f2b8..e4d2fadc98a9d1f8a61df00c85593191b2cdf2e6 100644 (file)
--- a/ipkg/control.opie
+++ b/ipkg/control.opie
@@ -3,10 +3,10 @@ Section: graphics
 Priority: optional
 Version: 0.4.6
 Release: 2
-Conflicts: gpe, vlc
+Conflicts: gpe, vlc, libsdl
 Architecture: arm
 Maintainer: Jean-Paul Saman <jpsaman@wxs.nl>,  Christophe Massiot <massiot@via.ecp.fr>
-Depends: libc6, task-opie
+Depends: libc6, task-opie, opie-libsdl
 Copyright: GPL
 Description: VideoLAN Client is a free network-aware MPEG and DVD player.
  VideoLAN is a free MPEG1/2 software solution licensed under GPL. The original 

diff --git a/ipkg/rules.opie b/ipkg/rules.opie
index 5a1c338a5728e2d0c13928c42c729767e3004315..f040aba5c5967eab50025716c275ce2b0cdbba28 100755 (executable)
--- a/ipkg/rules.opie
+++ b/ipkg/rules.opie
@@ -19,7 +19,7 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \
        --enable-qte \
        --disable-x11 \
        --enable-fb \
-       --disable-sdl \
+       --enable-sdl \
        --disable-alsa \
        --disable-xvideo \
        --disable-dvd \
@@ -31,6 +31,8 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \
        --disable-familiar \
        --with-tuning=strongarm1100 \
        --with-mad-tree=/home/jpsaman/iPaq/src/mad-0.14.2b \
+       --with-sdl-config-path=/usr/local/arm/2.95.3/arm-linux/opt/QtPalmtop/bin \
+       --with-sdl-prefix=/usr/local/arm/2.95.3/arm-linux/opt/QtPalmtop \
        --with-qte=/usr/local/arm/2.95.3/arm-linux/opt/QtPalmtop \
        --with-ffmpeg-tree=/home/jpsaman/iPaq/src/ffmpeg"
 
@@ -43,6 +45,7 @@ export QTDIR=/usr/local/arm/2.95.3/arm-linux/opt/QtPalmtop
 
 build: build-stamp
 config:
+       make distclean
        ./configure --mandir=$${prefix}/share/man \
                --infodir=$${prefix}/share/info \
                --host=arm-linux \
@@ -67,7 +70,7 @@ install: build
        mkdir -p ${PKGDIR}/CONTROL
        mkdir -p $(PKGDIR)/usr/bin
        mkdir -p ${PKGDIR}/usr/share/videolan
-       mkdir -p ${PKGDIR}/usr/lib/menu
+#      mkdir -p ${PKGDIR}/usr/lib/menu
        mkdir -p ${PKGDIR}/usr/lib/videolan/vlc
        mkdir -p ${PKGDIR}/opt/QtPalmtop/bin
        mkdir -p ${PKGDIR}/opt/QtPalmtop/apps/Applications