Modified build scripts

diff --git a/ipkg/control b/ipkg/control
index 0b67cd6acfd2b7d2dd5d645c2ce7170622cc7be1..825eb197cd2277ac6abd849467e88764e24d8072 100644 (file)
--- a/ipkg/control
+++ b/ipkg/control
@@ -6,7 +6,7 @@ Release: 1
 Architecture: arm
 Conflicts: gpe-vlc, opie-vlc, opie-libsdl, opie-base, opie-handwriting, opie-volumeapplet, opie-embeddedkonsole, opie-launcher-settings, opie-netsetup
 Maintainer: Jean-Paul Saman <jpsaman@wxs.nl>,  Christophe Massiot <massiot@via.ecp.fr>
-Depends: libc6, procps, xserver-tiny-h3600, xbase-clients, xfonts-base, xfonts-75dpi, xfonts-ttf, matchbox, xcalibrate, libsdl, libgtk1.2, esddsp, libffmpeg
+Depends: libc6, procps, xserver-tiny-h3600, xbase-clients, xfonts-base, xfonts-75dpi, xfonts-ttf, matchbox, xcalibrate, libsdl, libgtk1.2, esddsp
 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/control.gpe b/ipkg/control.gpe
index 777e936f67982356e1fd9bc0b11520047f6adc3a..3225fac5585f190bdbc91ca24b320f4f41932525 100644 (file)
--- a/ipkg/control.gpe
+++ b/ipkg/control.gpe
@@ -6,7 +6,7 @@ Release: 1
 Conflicts: opie-vlc, opie-libsdl, opie-base, opie-handwriting, opie-volumeapplet, opie-embeddedkonsole, opie-launcher-settings, opie-netsetup, vlc
 Architecture: arm
 Maintainer: Jean-Paul Saman <jpsaman@wxs.nl>
-Depends: libc6, gpe-apps, libsdl, esddsp, libffmpeg
+Depends: libc6, gpe-apps, libsdl, esddsp
 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/control.opie b/ipkg/control.opie
index 247488de9641b2060723aa1b908b184d2cdd220a..1bce9aa2a4001a21ae137abbfecff09b08d35fa6 100644 (file)
--- a/ipkg/control.opie
+++ b/ipkg/control.opie
@@ -6,7 +6,7 @@ Release: 1
 Conflicts: gpe-apps, vlc, gpe-vlc, libsdl
 Architecture: arm
 Maintainer: Jean-Paul Saman <jpsaman@wxs.nl>
-Depends: libc6, opie-base, opie-handwriting, opie-volumeapplet, opie-embeddedkonsole, opie-handwriting, opie-launcher-settings, opie-netsetup, opie-libsdl, libffmpeg
+Depends: libc6, opie-base, opie-handwriting, opie-volumeapplet, opie-embeddedkonsole, opie-handwriting, opie-launcher-settings, opie-netsetup, 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/control.zaurus b/ipkg/control.zaurus
index 443493764bc73960f8455d430bb67d63c2bc13f2..be4f4b872dc5a8161b4a4a6e1b577e87b2ac98a9 100644 (file)
--- a/ipkg/control.zaurus
+++ b/ipkg/control.zaurus
@@ -6,7 +6,7 @@ Release: 1
 Conflicts: gpe-apps, gpe-vlc, vlc, libsdl
 Architecture: arm
 Maintainer: Jean-Paul Saman <jpsaman@wxs.nl>
-Depends: libc6, opie-base, zaurus-libsdl, libffmpeg
+Depends: libc6, opie-base, zaurus-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 b/ipkg/rules
index 48a5dc1d615a371b0fb2e4001aabde03821d34f3..6685fe86ad613e969b93b5a148416ebc06f3b261 100755 (executable)
--- a/ipkg/rules
+++ b/ipkg/rules
@@ -31,8 +31,8 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \
        --disable-maxosx \
        --disable-xosd \
        --disable-freetype \
+       --enable-flac \
        --enable-libmpeg2 \
-       --with-libmpeg2-prefix=/usr/local/arm/2.95.3/arm-linux/usr \
        --enable-mad \
        --enable-ffmpeg \
        --enable-familiar \
@@ -44,8 +44,7 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \
        --with-gtk-prefix=/usr/local/arm/2.95.3/arm-linux/usr \
        --with-sdl-config-path=/usr/local/arm/2.95.3/arm-linux/usr/bin \
        --with-sdl-prefix=/usr/local/arm/2.95.3/arm-linux/usr \
-       --with-ffmpeg-tree=/home/jpsaman/svn/ipaq/Work/ffmpeg"
-#      --with-ffmpeg-tree=/home/jpsaman/iPaq/src/ffmpeg"
+       --with-ffmpeg-tree=/home/jpsaman/svn/tmp/ffmpeg-20030517"
 
 export VIDDIR="usr/share/vlc"
 export PIXDIR="usr/share/pixmaps"
@@ -58,7 +57,10 @@ config:
                --infodir=$${prefix}/share/info \
                --host=arm-linux \
                --target=arm-linux \
-               $(shell echo $(CONFIG_FLAGS))
+               $(shell echo $(CONFIG_FLAGS)) \
+       LDFLAGS="-L/usr/local/arm/2.95.3/arm-linux/lib -L/usr/local/arm/2.95.3/arm-linux/usr/lib" \
+       CPPFLAGS="-I/usr/local/arm/2.95.3/arm-linux/usr/include"
+
 #patch:
 # This is ugly -- I know
 #      patch -p 0 < ipkg/patch

diff --git a/ipkg/rules.gpe b/ipkg/rules.gpe
index 8a16281e9af4a4b58ba320ad697f5fcfd4c46973..a7b7ec340774568422f8c99ae6a5e1b90831fd68 100755 (executable)
--- a/ipkg/rules.gpe
+++ b/ipkg/rules.gpe
@@ -32,8 +32,8 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \
        --disable-maxosx \
        --disable-xosd \
        --disable-freetype \
+       --enable-flac \
        --enable-libmpeg2 \
-       --with-libmpeg2-prefix=/usr/local/arm/2.95.3/arm-linux/usr \
        --enable-mad \
        --enable-ffmpeg \
        --enable-familiar \
@@ -46,7 +46,7 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \
        --with-gpe-prefix=/usr/local/arm/2.95.3/arm-linux/usr \
        --with-sdl-config-path=/usr/local/arm/2.95.3/arm-linux/usr/bin \
        --with-sdl-prefix=/usr/local/arm/2.95.3/arm-linux/usr \
-       --with-ffmpeg-tree=/home/jpsaman/svn/ipaq/Work/ffmpeg"
+       --with-ffmpeg-tree=/home/jpsaman/svn/tmp/ffmpeg-20030517"
 
 export VIDDIR="usr/share/vlc"
 export PIXDIR="usr/share/pixmaps"
@@ -60,7 +60,8 @@ config:
                --host=arm-linux \
                --target=arm-linux \
                $(shell echo $(CONFIG_FLAGS)) \
-               LDFLAGS="-L/usr/local/arm/2.95.3/arm-linux/lib"
+               LDFLAGS="-L/usr/local/arm/2.95.3/arm-linux/lib -L/usr/local/arm/2.95.3/arm-linux/usr/lib" \
+CPPFLAGS="-I/usr/local/arm/2.95.3/arm-linux/usr/include"
 
 build:
 # This is ugly -- I know

diff --git a/ipkg/rules.opie b/ipkg/rules.opie
index 1eae248d46b82e7bfbf0f85228c85e9e85c6ae10..3cc83920f8f6faa484b22c1e8a8431ad97558ce5 100755 (executable)
--- a/ipkg/rules.opie
+++ b/ipkg/rules.opie
@@ -30,8 +30,8 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \
        --disable-maxosx \
        --disable-xosd \
        --disable-freetype \
+       --enable-flac \
        --enable-libmpeg2 \
-       --with-libmpeg2-prefix=/usr/local/arm/2.95.3/arm-linux/usr \
        --enable-mad \
        --enable-ffmpeg \
        --disable-familiar \
@@ -40,8 +40,7 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \
        --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/svn/ipaq/Work/ffmpeg"
-#      --with-ffmpeg-tree=/home/jpsaman/iPaq/src/ffmpeg
+       --with-ffmpeg-tree=/home/jpsaman/svn/tmp/ffmpeg-20030517"
 
 export VIDDIR="usr/share/vlc"
 export PIXDIR="usr/share/pixmaps"
@@ -56,7 +55,9 @@ config:
                --infodir=$${prefix}/share/info \
                --host=arm-linux \
                --target=arm-linux \
-               $(shell echo $(CONFIG_FLAGS))
+               $(shell echo $(CONFIG_FLAGS)) \
+       LDFLAGS="-L/usr/local/arm/2.95.3/arm-linux/lib -L/usr/local/arm/2.95.3/arm-linux/lib -L/usr/local/arm/2.95.3/arm-linux/opt/QtPalmtop/lib" \
+       CPPFLAGS="-IL/usr/local/arm/2.95.3/arm-linux/include -I/usr/local/arm/2.95.3/arm-linux/usr/include -I/usr/local/arm/2.95.3/arm-linux/opt/QtPalmtop/include"
 
 build-stamp:
 # This is ugly -- I know

diff --git a/ipkg/rules.zaurus b/ipkg/rules.zaurus
index eb0c28990e142b2a5261055ba3b78ba58b5d4534..c22b4deea9b51fd1691f1d6324c16277a56ba858 100755 (executable)
--- a/ipkg/rules.zaurus
+++ b/ipkg/rules.zaurus
@@ -30,8 +30,8 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \
        --disable-maxosx \
        --disable-xosd \
        --disable-freetype \
+       --enable-flac \
        --enable-libmpeg2 \
-       --with-libmpeg2-prefix=/usr/local/arm/2.95.3/arm-linux/usr \
        --enable-mad \
        --enable-ffmpeg \
        --disable-familiar \
@@ -40,7 +40,7 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \
        --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"
+       --with-ffmpeg-tree=/home/jpsaman/svn/tmp/ffmpeg-20030517"
 
 export VIDDIR="usr/share/vlc"
 export PIXDIR="usr/share/pixmaps"
@@ -55,7 +55,9 @@ config:
                --infodir=$${prefix}/share/info \
                --host=arm-linux \
                --target=arm-linux \
-               $(shell echo $(CONFIG_FLAGS))
+               $(shell echo $(CONFIG_FLAGS)) \
+       LDFLAGS="-L/usr/local/arm/2.95.3/arm-linux/lib -L/usr/local/arm/2.95.3/arm-linux/usr/lib -L/usr/local/arm/2.95.3/arm-linux/opt/QtPalmtop/lib" \
+       CPPFLAGS="-I/usr/local/arm/2.95.3/arm-linux/include -I/usr/local/arm/2.95.3/arm-linux/usr/include -I/usr/local/arm/2.95.3/arm-linux/QtPalmtop/include"
 
 build-stamp:
 # This is ugly -- I know