Updated build rules for iPaq.

diff --git a/ipkg/control b/ipkg/control
index b0f3e227f5befcafdd4803176cf8f9b0711109cd..db2f571c37a652e90aa02228f8b62ab995f3cb6a 100644 (file)
--- a/ipkg/control
+++ b/ipkg/control
@@ -2,11 +2,12 @@ Package: vlc
 Section: graphics
 Priority: optional
 Version: 0.6.0
-Release: 2
+Release: 3
 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
+Source: http://www.videolan.org/vlc/download-sources.html
+Conflicts: gpe-vlc, opie-vlc, opie-libsdl, opie-base
+Maintainer: Jean-Paul Saman <jpsaman@wxs.nl>
+Depends: libc6, 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 6f8e1fbf622f41190ab385dd5ddb052b7734d992..fadf658c6c64c93bcc21f7da0c1b77ccf069e939 100644 (file)
--- a/ipkg/control.gpe
+++ b/ipkg/control.gpe
@@ -2,11 +2,12 @@ Package: gpe-vlc
 Section: graphics
 Priority: optional
 Version: 0.6.0
-Release: 2
-Conflicts: opie-vlc, opie-libsdl, opie-base, opie-handwriting, opie-volumeapplet, opie-embeddedkonsole, opie-launcher-settings, opie-netsetup, vlc
+Release: 3
+Conflicts: opie-vlc, opie-libsdl, opie-base, vlc
 Architecture: arm
+Source: http://www.videolan.org/vlc/download-sources.html
 Maintainer: Jean-Paul Saman <jpsaman@wxs.nl>
-Depends: libc6, gpe-apps, libsdl, esddsp
+Depends: libc6, gpe-apps, gtk1.2, 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 59829610a3170bb172cc22c47e7c949fd2df1509..9ed675ff536d34d35e65820e9d8d6f13a88d899b 100644 (file)
--- a/ipkg/control.opie
+++ b/ipkg/control.opie
@@ -2,11 +2,12 @@ Package: opie-vlc
 Section: graphics
 Priority: optional
 Version: 0.6.0
-Release: 2
+Release: 3
 Conflicts: gpe-apps, vlc, gpe-vlc, libsdl
 Architecture: arm
+Source: http://www.videolan.org/vlc/download-sources.html
 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
+Depends: libc6, opie-base, 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 b/ipkg/rules
index 6685fe86ad613e969b93b5a148416ebc06f3b261..04ad3728a3dc884a74cb110aa3844c616b167b3b 100755 (executable)
--- a/ipkg/rules
+++ b/ipkg/rules
@@ -13,42 +13,58 @@ export STRIP=arm-linux-strip
 export CONFIG_FLAGS="--enable-release --prefix=/usr \
        --disable-plugins \
        --disable-gtk \
+       --disable-gtk2 \
        --disable-gnome \
+       --disable-gnome2 \
        --disable-qt \
        --disable-kde \
        --disable-qte \
        --disable-xosd \
+       --disable-ogg \
+       --disable-tarkin \
+       --disable-tremor \
+       --disable-theorea \
+       --enable-v4l \
        --enable-dummy \
        --enable-fb \
        --enable-sdl \
        --enable-oss \
        --disable-alsa \
        --enable-x11 \
-       --disable-xvideo \
+       --enable-xvideo \
        --disable-dvd \
        --disable-dvdread \
        --disable-vcd \
        --disable-maxosx \
        --disable-xosd \
        --disable-freetype \
+       --enable-a52 \
+       --enable-faad2 \
        --enable-flac \
        --enable-libmpeg2 \
+       --enable-libdvbpsi \
+       --disable-mkv \
        --enable-mad \
        --enable-ffmpeg \
        --enable-familiar \
        --with-tuning=strongarm1100 \
        --x-includes=/skiff/local/arm-linux/include \
        --x-libraries=/usr/local/arm/2.95.3/arm-linux/usr/X11R6/lib \
-       --with-mad-tree=/home/jpsaman/iPaq/src/mad-0.14.2b \
+       --with-libiconv-prefix=/usr/local/arm/2.95.3/arm-linux/usr \
+       --with-mad-tree=/home/jpsaman/iPaq/src/libmad-0.15.0b \
+       --with-a52-tree=/home/jpsaman/iPaq/src/a52dec-0.7.4 \
+       --with-faad2-tree=/home/jpsaman/iPaq/src/faad2-20030612 \
+       --with-flac-tree=/home/jpsaman/iPaq/src/flac-1.1.0 \
+       --with-libmpeg2-tree=/home/jpsaman/iPaq/src/mpeg2dec-20030612 \
+       --with-libdvbpsi-tree=/home/jpsaman/iPaq/src/libdvbpsi-0.1.2 \
        --with-gtk-config-path=/usr/local/arm/2.95.3/arm-linux/usr/bin \
        --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/tmp/ffmpeg-20030517"
+       --with-ffmpeg-tree=/home/jpsaman/iPaq/src/ffmpeg-20030622"
 
 export VIDDIR="usr/share/vlc"
 export PIXDIR="usr/share/pixmaps"
-#export DESTDIR=/tmp/vlc
 export DESTDIR=/usr/local/arm/2.95.3/arm-linux
 export PKGDIR=/home/jpsaman/iPaq/packages/vlc-0.6.0
 
@@ -59,7 +75,7 @@ config:
                --target=arm-linux \
                $(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"
+       CPPFLAGS="-I/usr/local/arm/2.95.3/arm-linux/include -I/usr/local/arm/2.95.3/arm-linux/usr/include"
 
 #patch:
 # This is ugly -- I know

diff --git a/ipkg/rules.gpe b/ipkg/rules.gpe
index a7b7ec340774568422f8c99ae6a5e1b90831fd68..52c2d0904b7c81b09069b35f070529c90aacc7e4 100755 (executable)
--- a/ipkg/rules.gpe
+++ b/ipkg/rules.gpe
@@ -14,12 +14,19 @@ export STRIP=arm-linux-strip
 export CONFIG_FLAGS="--enable-release --prefix=/usr \
        --disable-plugins \
        --disable-gtk \
+       --disable-gtk2 \
        --disable-gnome \
+       --disable-gnome2 \
        --disable-qt \
        --disable-kde \
        --disable-qte \
        --disable-xosd \
+       --disable-ogg \
+       --disable-tarkin \
+       --disable-tremor \
+       --disable-theorea \
        --enable-dummy \
+       --enable-v4l \
        --enable-fb \
        --enable-sdl \
        --enable-oss \
@@ -30,23 +37,32 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \
        --disable-dvdread \
        --disable-vcd \
        --disable-maxosx \
-       --disable-xosd \
        --disable-freetype \
+       --enable-a52 \
        --enable-flac \
+       --enable-faad2 \
        --enable-libmpeg2 \
+       --enable-libdvbpsi \
+       --disable-mkv \
        --enable-mad \
        --enable-ffmpeg \
        --enable-familiar \
        --with-tuning=strongarm1100 \
        --x-includes=/skiff/local/arm-linux/include \
        --x-libraries=/usr/local/arm/2.95.3/arm-linux/usr/X11R6/lib \
-       --with-mad-tree=/home/jpsaman/iPaq/src/mad-0.14.2b \
+       --with-libiconv-prefix=/usr/local/arm/2.95.3/arm-linux/usr \
+       --with-mad-tree=/home/jpsaman/iPaq/src/libmad-0.15.0b \
+       --with-a52-tree=/home/jpsaman/iPaq/src/a52dec-0.7.4 \
+       --with-faad2-tree=/home/jpsaman/iPaq/src/faad2-20030612 \
+       --with-flac-tree=/home/jpsaman/iPaq/src/flac-1.1.0 \
+       --with-libmpeg2-tree=/home/jpsaman/iPaq/src/mpeg2dec-20030612 \
+       --with-libdvbpsi-tree=/home/jpsaman/iPaq/src/libdvbpsi-0.1.2 \
        --with-gtk-config-path=/usr/local/arm/2.95.3/arm-linux/usr/bin \
        --with-gtk-prefix=/usr/local/arm/2.95.3/arm-linux/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/tmp/ffmpeg-20030517"
+       --with-ffmpeg-tree=/home/jpsaman/iPaq/src/ffmpeg-20030622"
 
 export VIDDIR="usr/share/vlc"
 export PIXDIR="usr/share/pixmaps"
@@ -61,7 +77,7 @@ config:
                --target=arm-linux \
                $(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"
+               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 6526ce978c5af10bc4c0dfa1945db58a11263c96..4f976878bae992faeea0da73e603b1847f403f6a 100755 (executable)
--- a/ipkg/rules.opie
+++ b/ipkg/rules.opie
@@ -13,34 +13,52 @@ export STRIP=arm-linux-strip
 export CONFIG_FLAGS="--enable-release --prefix=/usr \
        --disable-plugins \
        --disable-gtk \
+       --disable-gtk2 \
        --disable-gnome \
+       --disable-gnome2 \
        --disable-qt \
        --disable-kde \
        --disable-xosd \
+       --disable-ogg \
+       --disable-tarkin \
+       --disable-tremor \
+       --disable-theorea \
        --enable-qte \
        --disable-x11 \
+       --disable-xvideo \
        --enable-dummy \
+       --enable-v4l \
        --enable-fb \
        --enable-sdl \
+       --enable-oss \
        --disable-alsa \
        --disable-xvideo \
        --disable-dvd \
        --disable-dvdread \
        --disable-vcd \
        --disable-maxosx \
-       --disable-xosd \
        --disable-freetype \
+       --enable-a52 \
+       --enable-faad2 \
        --enable-flac \
        --enable-libmpeg2 \
+       --enable-libdvbpsi \
+       --disable-mkv \
        --enable-mad \
        --enable-ffmpeg \
        --disable-familiar \
        --with-tuning=strongarm1100 \
-       --with-mad-tree=/home/jpsaman/iPaq/src/mad-0.14.2b \
+       --with-libiconv-prefix=/usr/local/arm/2.95.3/arm-linux/usr \
+       --with-mad-tree=/home/jpsaman/iPaq/src/libmad-0.15.0b \
+       --with-a52-tree=/home/jpsaman/iPaq/src/a52dec-0.7.4 \
+       --with-faad2-tree=/home/jpsaman/iPaq/src/faad2-20030612 \
+       --with-flac-tree=/home/jpsaman/iPaq/src/flac-1.1.0 \
+       --with-libmpeg2-tree=/home/jpsaman/iPaq/src/mpeg2dec-20030612 \
+       --with-libdvbpsi-tree=/home/jpsaman/iPaq/src/libdvbpsi-0.1.2 \
        --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/tmp/ffmpeg-20030517"
+       --with-ffmpeg-tree=/home/jpsaman/iPaq/src/ffmpeg-20030622"
 
 export VIDDIR="usr/share/vlc"
 export PIXDIR="usr/share/pixmaps"
@@ -56,8 +74,8 @@ config:
                --host=arm-linux \
                --target=arm-linux \
                $(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="-I/usr/local/arm/2.95.3/arm-linux/usr/include -I/usr/local/arm/2.95.3/arm-linux/opt/QtPalmtop/include"
+       LDFLAGS="-L/usr/local/arm/2.95.3/arm-linux/lib -L/usr/local/arm/2.95.3/arm-linux/opt/QtPalmtop/lib -L/home/jpsaman/iPaq/src/libid3tag-0.15.0b" \
+       CPPFLAGS="-I/usr/local/arm/2.95.3/arm-linux/opt/QtPalmtop/include -I/home/jpsaman/iPaq/src/libid3tag-0.15.0b"
 
 build-stamp:
 # This is ugly -- I know

diff --git a/ipkg/rules.zaurus b/ipkg/rules.zaurus
index 8fd439930f3e39001b9c1710a87f9c1d8ac8ca0a..44dbd97c5f06a6b80cd711f5df6935bdb047f980 100755 (executable)
--- a/ipkg/rules.zaurus
+++ b/ipkg/rules.zaurus
@@ -36,7 +36,7 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \
        --enable-ffmpeg \
        --disable-familiar \
        --with-tuning=strongarm1100 \
-       --with-mad-tree=/home/jpsaman/iPaq/src/mad-0.14.2b \
+       --with-mad-tree=/home/jpsaman/iPaq/src/mad-0.15.0b \
        --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 \