Updated build scripts:

- enabled video4linux for WebCams on handhelds
- enabled PDA Gtk2 interface instead of familiar interface
- enabled stream output and transcoding

diff --git a/ipkg/control b/ipkg/control
index db2f571c37a652e90aa02228f8b62ab995f3cb6a..5d169a20779e52554055389791f31fd27a90d7d4 100644 (file)
--- a/ipkg/control
+++ b/ipkg/control
@@ -1,8 +1,8 @@
 Package: vlc
 Section: graphics
 Priority: optional
-Version: 0.6.0
-Release: 3
+Version: 0.6.1
+Release: 1
 Architecture: arm
 Source: http://www.videolan.org/vlc/download-sources.html
 Conflicts: gpe-vlc, opie-vlc, opie-libsdl, opie-base

diff --git a/ipkg/control.gpe b/ipkg/control.gpe
index fadf658c6c64c93bcc21f7da0c1b77ccf069e939..8bbd28b91de9957321fa8cca22258779bcfa374c 100644 (file)
--- a/ipkg/control.gpe
+++ b/ipkg/control.gpe
@@ -1,8 +1,8 @@
 Package: gpe-vlc
 Section: graphics
 Priority: optional
-Version: 0.6.0
-Release: 3
+Version: 0.6.1
+Release: 1
 Conflicts: opie-vlc, opie-libsdl, opie-base, vlc
 Architecture: arm
 Source: http://www.videolan.org/vlc/download-sources.html

diff --git a/ipkg/control.opie b/ipkg/control.opie
index 9ed675ff536d34d35e65820e9d8d6f13a88d899b..e68fb53694d712ac4e44a599ffd6c40f575c9590 100644 (file)
--- a/ipkg/control.opie
+++ b/ipkg/control.opie
@@ -1,8 +1,8 @@
 Package: opie-vlc
 Section: graphics
 Priority: optional
-Version: 0.6.0
-Release: 3
+Version: 0.6.1
+Release: 1
 Conflicts: gpe-apps, vlc, gpe-vlc, libsdl
 Architecture: arm
 Source: http://www.videolan.org/vlc/download-sources.html

diff --git a/ipkg/control.zaurus b/ipkg/control.zaurus
index 0bc2deb6392374d8ea8f9866031be1aad9a2ab63..9dca3c2892fec4867d9bfcdd47a423a1b4ece219 100644 (file)
--- a/ipkg/control.zaurus
+++ b/ipkg/control.zaurus
@@ -1,8 +1,8 @@
 Package: zaurus-vlc
 Section: graphics
 Priority: optional
-Version: 0.6.0
-Release: 2 
+Version: 0.6.1
+Release: 1 
 Conflicts: gpe-apps, gpe-vlc, vlc, libsdl
 Architecture: arm
 Source: http://www.videolan.org/vlc/download-sources.html

diff --git a/ipkg/rules b/ipkg/rules
index 04ad3728a3dc884a74cb110aa3844c616b167b3b..2dd3caa9b3356798f35e43d1b31d60eee4540c4f 100755 (executable)
--- a/ipkg/rules
+++ b/ipkg/rules
@@ -25,18 +25,18 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \
        --disable-tremor \
        --disable-theorea \
        --enable-v4l \
+       --enable-sout \
        --enable-dummy \
        --enable-fb \
        --enable-sdl \
        --enable-oss \
        --disable-alsa \
        --enable-x11 \
-       --enable-xvideo \
+       --disable-xvideo \
        --disable-dvd \
        --disable-dvdread \
        --disable-vcd \
        --disable-maxosx \
-       --disable-xosd \
        --disable-freetype \
        --enable-a52 \
        --enable-faad2 \
@@ -46,7 +46,7 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \
        --disable-mkv \
        --enable-mad \
        --enable-ffmpeg \
-       --enable-familiar \
+       --enable-pda \
        --with-tuning=strongarm1100 \
        --x-includes=/skiff/local/arm-linux/include \
        --x-libraries=/usr/local/arm/2.95.3/arm-linux/usr/X11R6/lib \
@@ -57,8 +57,6 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \
        --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/iPaq/src/ffmpeg-20030622"
@@ -66,7 +64,7 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \
 export VIDDIR="usr/share/vlc"
 export PIXDIR="usr/share/pixmaps"
 export DESTDIR=/usr/local/arm/2.95.3/arm-linux
-export PKGDIR=/home/jpsaman/iPaq/packages/vlc-0.6.0
+export PKGDIR=/home/jpsaman/iPaq/packages/vlc-0.6.1
 
 config:
        ./configure --mandir=$${prefix}/share/man \

diff --git a/ipkg/rules.gpe b/ipkg/rules.gpe
index 52c2d0904b7c81b09069b35f070529c90aacc7e4..d0deb8a5cef2e279fa8e017f053eca831ac508e1 100755 (executable)
--- a/ipkg/rules.gpe
+++ b/ipkg/rules.gpe
@@ -27,12 +27,13 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \
        --disable-theorea \
        --enable-dummy \
        --enable-v4l \
+       --enable-sout \
        --enable-fb \
        --enable-sdl \
        --enable-oss \
        --disable-alsa \
        --enable-x11 \
-       --enable-xvideo \
+       --disable-xvideo \
        --disable-dvd \
        --disable-dvdread \
        --disable-vcd \
@@ -46,7 +47,7 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \
        --disable-mkv \
        --enable-mad \
        --enable-ffmpeg \
-       --enable-familiar \
+       --enable-pda \
        --with-tuning=strongarm1100 \
        --x-includes=/skiff/local/arm-linux/include \
        --x-libraries=/usr/local/arm/2.95.3/arm-linux/usr/X11R6/lib \
@@ -57,8 +58,6 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \
        --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 \
@@ -68,7 +67,7 @@ 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/gpe-vlc-0.6.0
+export PKGDIR=/home/jpsaman/iPaq/packages/gpe-vlc-0.6.1
 
 config:
        ./configure --mandir=$${prefix}/share/man \

diff --git a/ipkg/rules.opie b/ipkg/rules.opie
index 4f976878bae992faeea0da73e603b1847f403f6a..2ff6d4c67fcb61f358bb58e3405e79bdf290f38c 100755 (executable)
--- a/ipkg/rules.opie
+++ b/ipkg/rules.opie
@@ -28,6 +28,7 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \
        --disable-xvideo \
        --enable-dummy \
        --enable-v4l \
+       --enable-sout \
        --enable-fb \
        --enable-sdl \
        --enable-oss \
@@ -46,7 +47,7 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \
        --disable-mkv \
        --enable-mad \
        --enable-ffmpeg \
-       --disable-familiar \
+       --disable-pda \
        --with-tuning=strongarm1100 \
        --with-libiconv-prefix=/usr/local/arm/2.95.3/arm-linux/usr \
        --with-mad-tree=/home/jpsaman/iPaq/src/libmad-0.15.0b \
@@ -64,7 +65,7 @@ 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/opie-vlc-0.6.0
+export PKGDIR=/home/jpsaman/iPaq/packages/opie-vlc-0.6.1
 export QTDIR=/usr/local/arm/2.95.3/arm-linux/opt/QtPalmtop
 
 build: build-stamp

diff --git a/ipkg/rules.zaurus b/ipkg/rules.zaurus
index 1e0f85de2cc322b7054445a1681c742a7c1e50cb..97b70d54d066174fa0eb17e03dac9a44549b12b6 100755 (executable)
--- a/ipkg/rules.zaurus
+++ b/ipkg/rules.zaurus
@@ -28,11 +28,11 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \
        --disable-xvideo \
        --enable-dummy \
        --enable-v4l \
+       --enable-sout \
        --enable-fb \
        --enable-sdl \
        --enable-oss \
        --disable-alsa \
-       --disable-xvideo \
        --disable-dvd \
        --disable-dvdread \
        --disable-vcd \
@@ -46,7 +46,7 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \
        --disable-mkv \
        --enable-mad \
        --enable-ffmpeg \
-       --disable-familiar \
+       --disable-pda \
        --with-tuning=strongarm1100 \
        --with-libiconv-prefix=/usr/local/arm/2.95.3/arm-linux/usr \
        --with-mad-tree=/home/jpsaman/iPaq/src/libmad-0.15.0b \
@@ -64,7 +64,7 @@ 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/zaurus-vlc-0.6.0
+export PKGDIR=/home/jpsaman/iPaq/packages/zaurus-vlc-0.6.1
 export QTDIR=/usr/local/arm/2.95.3/arm-linux/opt/QtPalmtop
 
 build: build-stamp