Commit da71b5e7 authored by Jean-Paul Saman's avatar Jean-Paul Saman

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

parent 7cf947c9
...@@ -12291,7 +12291,7 @@ fi; ...@@ -12291,7 +12291,7 @@ fi;
if test x${SDL_CONFIG} != xno if test x${SDL_CONFIG} != xno
then then
PLUGINS="${PLUGINS} sdl" 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,,'`" sdl_LDFLAGS="${sdl_LDFLAGS} `${SDL_CONFIG} ${SDL_PREFIX} --libs | sed 's,-rdynamic,,'`"
CPPFLAGS="$save_CPPFLAGS $sdl_CFLAGS" CPPFLAGS="$save_CPPFLAGS $sdl_CFLAGS"
...@@ -14413,23 +14413,25 @@ if test "${enable_opie+set}" = set; then ...@@ -14413,23 +14413,25 @@ if test "${enable_opie+set}" = set; then
enableval="$enable_opie" enableval="$enable_opie"
if test "x${enable_opie}" = "xyes"; then if test "x${enable_opie}" = "xyes"; then
# Check whether --with-qte or --without-qte was given. # Check whether --with-qte or --without-qte was given.
if test "${with_qte+set}" = set; then if test "${with_qte+set}" = set; then
withval="$with_qte" withval="$with_qte"
fi; fi;
if test "x${with_qte}" != "xno" if test "x${with_qte}" != "xno" -a "x${with_qte}" != "x"
then then
test_LDFLAGS="-L${with_qte}/lib" test_LDFLAGS="-L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'`"
test_CFLAGS="-I${with_qte}/include" test_CFLAGS="-I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'`"
else else
test_LDFLAGS="-L${QTDIR}/lib" test_LDFLAGS="-L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'`"
test_CFLAGS="-I${QTDIR}/include" test_CFLAGS="-I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'`"
fi fi
ac_cv_qte_headers=yes
CPPFLAGS="${save_CPPFLAGS} ${test_CFLAGS}" 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 do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then if eval "test \"\${$as_ac_Header+set}\" = set"; then
...@@ -14538,21 +14540,24 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then ...@@ -14538,21 +14540,24 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF _ACEOF
test_CFLAGS="${test_CFLAGS} -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti"
test_LDFLAGS="${test_LDFLAGS} -lqpe -lqte"
else else
ac_cv_qte_headers=no ac_cv_qte_headers=no
{ { echo "$as_me:$LINENO: error: echo \"Cannot find QT Embedded development headers.\"" >&5 { { 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;} echo "$as_me: error: echo \"Cannot find QT Embedded development headers.\"" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
done 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}" CPPFLAGS="${save_CPPFLAGS}"
if test x${ac_cv_qte_headers} = "xyes" if test x${ac_cv_qte_headers} = "xyes"
then then
PLUGINS="${PLUGINS} opie" PLUGINS="${PLUGINS} opie"
......
...@@ -1196,7 +1196,7 @@ then ...@@ -1196,7 +1196,7 @@ then
if test x${SDL_CONFIG} != xno if test x${SDL_CONFIG} != xno
then then
PLUGINS="${PLUGINS} sdl" 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,,'`" sdl_LDFLAGS="${sdl_LDFLAGS} `${SDL_CONFIG} ${SDL_PREFIX} --libs | sed 's,-rdynamic,,'`"
CPPFLAGS="$save_CPPFLAGS $sdl_CFLAGS" CPPFLAGS="$save_CPPFLAGS $sdl_CFLAGS"
AC_CHECK_HEADERS(${SDL_HEADER}, AC_DEFINE_UNQUOTED(SDL_INCLUDE_FILE, AC_CHECK_HEADERS(${SDL_HEADER}, AC_DEFINE_UNQUOTED(SDL_INCLUDE_FILE,
...@@ -1640,27 +1640,30 @@ dnl ...@@ -1640,27 +1640,30 @@ dnl
AC_ARG_ENABLE(opie, AC_ARG_ENABLE(opie,
[ --enable-opie Qt embedded interface support (default disabled)], [ --enable-opie Qt embedded interface support (default disabled)],
[if test "x${enable_opie}" = "xyes"; then [if test "x${enable_opie}" = "xyes"; then
AC_ARG_WITH(qte, AC_ARG_WITH(qte,
[ --with-qte=PATH Qt Embedded headers and libraries]) [ --with-qte=PATH Qt Embedded headers and libraries])
if test "x${with_qte}" != "xno" if test "x${with_qte}" != "xno" -a "x${with_qte}" != "x"
then then
test_LDFLAGS="-L${with_qte}/lib" test_LDFLAGS="-L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'`"
test_CFLAGS="-I${with_qte}/include" test_CFLAGS="-I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'`"
else else
test_LDFLAGS="-L${QTDIR}/lib" test_LDFLAGS="-L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'`"
test_CFLAGS="-I${QTDIR}/include" test_CFLAGS="-I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'`"
fi fi
ac_cv_qte_headers=yes
CPPFLAGS="${save_CPPFLAGS} ${test_CFLAGS}" CPPFLAGS="${save_CPPFLAGS} ${test_CFLAGS}"
AC_CHECK_HEADERS(qte.h, [ ac_cv_qte_headers=yes
test_CFLAGS="${test_CFLAGS} -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti" AC_CHECK_HEADERS(qt.h jpeglib.h, ,[
test_LDFLAGS="${test_LDFLAGS} -lqpe -lqte" ac_cv_qte_headers=no
],
[ ac_cv_qte_headers=no
AC_MSG_ERROR([echo "Cannot find QT Embedded development headers."]) 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}" CPPFLAGS="${save_CPPFLAGS}"
if test x${ac_cv_qte_headers} = "xyes" if test x${ac_cv_qte_headers} = "xyes"
then then
PLUGINS="${PLUGINS} opie" PLUGINS="${PLUGINS} opie"
......
...@@ -3,10 +3,10 @@ Section: graphics ...@@ -3,10 +3,10 @@ Section: graphics
Priority: optional Priority: optional
Version: 0.4.6 Version: 0.4.6
Release: 2 Release: 2
Conflicts: gpe, vlc Conflicts: gpe, vlc, libsdl
Architecture: arm Architecture: arm
Maintainer: Jean-Paul Saman <jpsaman@wxs.nl>, Christophe Massiot <massiot@via.ecp.fr> 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 Copyright: GPL
Description: VideoLAN Client is a free network-aware MPEG and DVD player. 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 VideoLAN is a free MPEG1/2 software solution licensed under GPL. The original
......
...@@ -19,7 +19,7 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \ ...@@ -19,7 +19,7 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \
--enable-qte \ --enable-qte \
--disable-x11 \ --disable-x11 \
--enable-fb \ --enable-fb \
--disable-sdl \ --enable-sdl \
--disable-alsa \ --disable-alsa \
--disable-xvideo \ --disable-xvideo \
--disable-dvd \ --disable-dvd \
...@@ -31,6 +31,8 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \ ...@@ -31,6 +31,8 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \
--disable-familiar \ --disable-familiar \
--with-tuning=strongarm1100 \ --with-tuning=strongarm1100 \
--with-mad-tree=/home/jpsaman/iPaq/src/mad-0.14.2b \ --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-qte=/usr/local/arm/2.95.3/arm-linux/opt/QtPalmtop \
--with-ffmpeg-tree=/home/jpsaman/iPaq/src/ffmpeg" --with-ffmpeg-tree=/home/jpsaman/iPaq/src/ffmpeg"
...@@ -43,6 +45,7 @@ export QTDIR=/usr/local/arm/2.95.3/arm-linux/opt/QtPalmtop ...@@ -43,6 +45,7 @@ export QTDIR=/usr/local/arm/2.95.3/arm-linux/opt/QtPalmtop
build: build-stamp build: build-stamp
config: config:
make distclean
./configure --mandir=$${prefix}/share/man \ ./configure --mandir=$${prefix}/share/man \
--infodir=$${prefix}/share/info \ --infodir=$${prefix}/share/info \
--host=arm-linux \ --host=arm-linux \
...@@ -67,7 +70,7 @@ install: build ...@@ -67,7 +70,7 @@ install: build
mkdir -p ${PKGDIR}/CONTROL mkdir -p ${PKGDIR}/CONTROL
mkdir -p $(PKGDIR)/usr/bin mkdir -p $(PKGDIR)/usr/bin
mkdir -p ${PKGDIR}/usr/share/videolan 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}/usr/lib/videolan/vlc
mkdir -p ${PKGDIR}/opt/QtPalmtop/bin mkdir -p ${PKGDIR}/opt/QtPalmtop/bin
mkdir -p ${PKGDIR}/opt/QtPalmtop/apps/Applications mkdir -p ${PKGDIR}/opt/QtPalmtop/apps/Applications
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment