Added configuration for h3600 iPAQ PDA with small Flash sizes.

Removed unused files.

diff --git a/ipkg/control.gpe b/ipkg/control.gpe
index b699f8e8b0c9cbc007b40f61d4c6106fc3e46422..2bfa16afc93ae3142f56bf6b5e7403e8825862c0 100644 (file)
--- a/ipkg/control.gpe
+++ b/ipkg/control.gpe
@@ -1,17 +1,18 @@
 Package: gpe-vlc
 Section: graphics
 Priority: optional
-Version: 0.7.1
-Release: 1
-Conflicts: opie-vlc, opie-libsdl, opie-base, vlc
+Version: 0.7.1.test1
+Release: 3
 Architecture: arm
 Source: http://www.videolan.org/vlc/download-sources.html
+Conflicts: gpe-vlc-h3600, vlc, opie-vlc, opie-base
 Maintainer: Jean-Paul Saman <jpsaman@wxs.nl>
-Depends: libc6, gpe-apps, gtk1.2, libsdl, esddsp
+Depends: libc6, libgtk2.0-0, 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 
- source can be found on: http://www.videolan.org/pub/videolan/vlc/
+ source can be found on: 
+ http://www.videolan.org/pub/videolan/vlc/
  The VideoLAN Client allows to play MPEG1, MPEG2 Transport Streams and 
- Program Streams, MP3, Divx and other codecs from the network or from a file,
+ Program Streams, MP3, DivX and other codes from the network or from a file,
  as well as direct DVD playback. 

diff --git a/ipkg/control b/ipkg/control.h3600
similarity index 86%
rename from ipkg/control
rename to ipkg/control.h3600
index fee02c75ebd0b476a552a09add86543b1443927a..b026c2e93e46745ca31c86a9b9e0d93107b54d68 100644 (file)
--- a/ipkg/control
+++ b/ipkg/control.h3600
@@ -1,11 +1,11 @@
-Package: vlc
+Package: gpe-vlc-h3600
 Section: graphics
 Priority: optional
-Version: 0.7.1
-Release: 1
+Version: 0.7.1.test1
+Release: 2
 Architecture: arm
 Source: http://www.videolan.org/vlc/download-sources.html
-Conflicts: gpe-vlc, opie-vlc, opie-libsdl, opie-base
+Conflicts: gpe-vlc, vlc, opie-vlc, opie-base
 Maintainer: Jean-Paul Saman <jpsaman@wxs.nl>
 Depends: libc6, libgtk2.0-0, esddsp
 Copyright: GPL

diff --git a/ipkg/postinst b/ipkg/postinst
deleted file mode 100755 (executable)
index 273d0cf..0000000
--- a/ipkg/postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-/sbin/ldconfig
-exit $?

diff --git a/ipkg/postrm b/ipkg/postrm
deleted file mode 100755 (executable)
index 273d0cf..0000000
--- a/ipkg/postrm
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-/sbin/ldconfig
-exit $?

diff --git a/ipkg/rules b/ipkg/rules
index 9cd98f6081ec38011ae245353b08812e1e59a72a..74a7857e6a722400fb377f2b9bc79e2c3e76a638 100755 (executable)
--- a/ipkg/rules
+++ b/ipkg/rules
@@ -17,7 +17,7 @@ export DESTDIR=${HOME}/arm-linux
 export PKGDIR=${HOME}/packages/vlc-$(VERSION)
 
 export CONFIG_FLAGS="--enable-release --prefix=${HOME}/arm-linux/task-bootgpe2-v0.7.2-3600/usr \
-       --disable-plugins \
+       --enable-plugins \
        --disable-gtk \
        --disable-gtk2 \
        --disable-gnome \
@@ -31,6 +31,7 @@ export CONFIG_FLAGS="--enable-release --prefix=${HOME}/arm-linux/task-bootgpe2-v
        --disable-tremor \
        --disable-theorea \
        --disable-skins \
+       --disable-skins2 \
        --disable-sdl \
        --enable-v4l \
        --enable-sout \
@@ -50,7 +51,7 @@ export CONFIG_FLAGS="--enable-release --prefix=${HOME}/arm-linux/task-bootgpe2-v
        --disable-maxosx \
        --disable-goom \
        --disable-speex \
-       --enable-visual \
+       --disable-visual \
        --enable-freetype \
        --disable-fribidi \
        --enable-a52 \
@@ -68,21 +69,20 @@ export CONFIG_FLAGS="--enable-release --prefix=${HOME}/arm-linux/task-bootgpe2-v
        --x-libraries=${HOME}/arm-linux/task-bootgpe2-v0.7.2-3600/usr/X11R6/lib \
        --with-tuning=strongarm1100 \
        --with-dvbpsi-tree=${HOME}/arm-linux/vlc-$(VERSION)/libdvbpsi-0.1.3 \
-       --with-libiconv-prefix=${HOME}/arm-linux//vlc-$(VERSION)/libiconv-1.9.1 \
        --with-mad-tree=${HOME}/arm-linux/vlc-$(VERSION)/libmad-0.15.0b \
        --with-id3tag-tree=${HOME}/arm-linux/vlc-$(VERSION)/libid3tag-0.15.0b \
        --with-a52-tree=${HOME}/arm-linux/vlc-$(VERSION)/a52dec-0.7.4 \
-       --with-faad-tree=${HOME}/arm-linux/vlc-$(VERSION)/faad2 \
-       --with-libmpeg2-tree=${HOME}/arm-linux/vlc-$(VERSION)/mpeg2dec-20031126 \
+       --with-faad-tree=${HOME}/arm-linux/vlc-$(VERSION)/faad2-20040124 \
+       --with-libmpeg2-tree=${HOME}/arm-linux/vlc-$(VERSION)/mpeg2dec-0.4.0 \
        --with-slp=${HOME}/arm-linux/vlc-$(VERSION)/openslp-1.0.11/libslp \
        --with-included-gettext=${HOME}/arm-linux/vlc-$(VERSION)/gettext-0.12.1 \
        --with-v4l=${HOME}/arm-linux/vlc-$(VERSION)/linux/kernel \
        --with-ffmpeg-mp3lame \
        --with-ffmpeg-faac \
-       --with-ffmpeg-tree=${HOME}/arm-linux/vlc-$(VERSION)/ffmpeg-20031024"
+       --with-ffmpeg-tree=${HOME}/arm-linux/vlc-$(VERSION)/ffmpeg-20040103"
 
-# --with-freetype-config-path=${HOME}/arm-linux/vlc-$(VERSION)/freetype-2.1.4/builds/unix 
-# -L${HOME}/arm-linux/vlc-$(VERSION)/freetype-2.1.4/objs/.libs \
+# park here ;-0
+# --with-libiconv-prefix=${HOME}/arm-linux//vlc-$(VERSION)/libiconv-1.9.1
 
 config:
        ./configure --mandir=$${prefix}/share/man \
@@ -91,11 +91,11 @@ config:
                --target=arm-linux \
                $(shell echo $(CONFIG_FLAGS)) \
        LDFLAGS="-L${HOME}/arm-linux/vlc-$(VERSION)/openslp-1.0.11/libslp/.libs \
-               -L${HOME}/arm-linux/vlc-$(VERSION)/libpng-1.2.5 \
                -L${HOME}/arm-linux/vlc-$(VERSION)/lame-3.93.1/libmp3lame/.libs \
                -L${HOME}/arm-linux/vlc-$(VERSION)/libid3tag-0.15.0b/.libs \
                -L${HOME}/arm-linux/vlc-$(VERSION)/flac-1.1.0/src/libFLAC/.libs \
-               -L${HOME}/src/faac/libfaac/.libs \
+               -L${HOME}/arm-linux/vlc-$(VERSION)/faac/libfaac/.libs \
+               -L${HOME}/arm-linux/vlc-$(VERSION)/faad2-20040124/libfaad/.libs \
                -L${HOME}/arm-linux/vlc-$(VERSION)/libdvbpsi-0.1.3/src/.libs/ \
                -L${HOME}/arm-linux/task-bootgpe2-v0.7.2-3600/lib \
                -L${HOME}/arm-linux/task-bootgpe2-v0.7.2-3600/usr/lib \
@@ -103,11 +103,11 @@ config:
        CFLAGS="-I${HOME}/arm-linux/vlc-$(VERSION)/openslp-1.0.11/libslp \
                -I${HOME}/arm-linux/vlc-$(VERSION)/libpng-1.2.5 \
                -I${HOME}/arm-linux/vlc-$(VERSION)/lame-3.93.1/include \
-               -I${HOME}/arm-linux/vlc-$(VERSION)/freetype-2.1.4/include \
                -I${HOME}/arm-linux/vlc-$(VERSION)/libid3tag-0.15.0b \
                -I${HOME}/arm-linux/vlc-$(VERSION)/libdvbpsi-0.1.3  \
                -I${HOME}/arm-linux/vlc-$(VERSION)/flac-1.1.0/include \
-               -I${HOME}/src/faac/libfaac \
+               -I${HOME}/arm-linux/vlc-$(VERSION)/faac/libfaac \
+               -I${HOME}/arm-linux/vlc-$(VERSION)/faad2-20040124/include \
                -I${HOME}/arm-linux/linux/kernel/include \
                -I${HOME}/arm-linux/task-bootgpe2-v0.7.2-3600/include \
                -I${HOME}/arm-linux/task-bootgpe2-v0.7.2-3600/usr/X11R6/include \
@@ -120,26 +120,25 @@ config:
 build:
        $(MAKE) LDFLAGS="-L${HOME}/arm-linux/task-bootgpe2-v0.7.2-3600/usr/X11R6/lib -lX11 -lXext -lXft -lXrender -lXrandr -lfontconfig -lexpat \
                -L${HOME}/arm-linux/task-bootgpe2-v0.7.2-3600/lib \
-               -L${HOME}/arm-linux/task-bootgpe2-v0.7.2-3600/usr/lib \
+               -L${HOME}/arm-linux/task-bootgpe2-v0.7.2-3600/usr/lib -lfreetype\
                -L${HOME}/arm-linux/vlc-$(VERSION)/openslp-1.0.11/libslp/.libs \
-               -L${HOME}/arm-linux/vlc-$(VERSION)/libpng-1.2.5 \
                -L${HOME}/arm-linux/vlc-$(VERSION)/lame-3.93.1/libmp3lame/.libs \
                -L${HOME}/arm-linux/vlc-$(VERSION)/libid3tag-0.15.0b/.libs \
                -L${HOME}/arm-linux/vlc-$(VERSION)/libdvbpsi-0.1.3/src/.libs/ \
-               -L${HOME}/arm-linux/vlc-$(VEASION)/flac-1.1.0/src/libFLAC/.libs \
-               -L${HOME}/src/faac/libfaac/.libs" \
+               -L${HOME}/arm-linux/vlc-$(VERSION)/flac-1.1.0/src/libFLAC/.libs \
+               -L${HOME}/arm-linux/vlc-$(VERSION)/faad2-20040124/libfaad/.libs \
+               -L${HOME}/arm-linux/vlc-$(VERSION)/faac/libfaac/.libs" \
        CFLAGS="-I${HOME}/arm-linux/linux/kernel/include \
                -I${HOME}/arm-linux/task-bootgpe2-v0.7.2-3600/usr/X11R6/include \
                -I${HOME}/arm-linux/task-bootgpe2-v0.7.2-3600/include \
                -I${HOME}/arm-linux/task-bootgpe2-v0.7.2-3600/usr/include \
                -I${HOME}/arm-linux/vlc-$(VERSION)/openslp-1.0.11/libslp \
-               -I${HOME}/arm-linux/vlc-$(VERSION)/libpng-1.2.5 \
                -I${HOME}/arm-linux/vlc-$(VERSION)/lame-3.93.1/include \
-               -I${HOME}/arm-linux/vlc-$(VERSION)/freetype-2.1.4/include \
                -I${HOME}/arm-linux/vlc-$(VERSION)/libid3tag-0.15.0b \
                -I${HOME}/arm-linux/vlc-$(VERSION)/libdvbpsi-0.1.3 \
                -I${HOME}/arm-linux/vlc-$(VERSION)/flac-1.1.0/include \
-               -I${HOME}/src/faac/libfaac \
+               -I${HOME}/arm-linux/vlc-$(VERSION)/faad2-20040124/include \
+               -I${HOME}/arm-linux/vlc-$(VERSION)/faac/libfaac \
                -I${HOME}/arm-linux/vlc-$(VERSION)/openslp-1.0.11/libslp"
 
 clean:
@@ -174,5 +173,5 @@ install-plugins: install
        find ./ -name *.so | xargs cp ${PKGDIR}/usr/lib/vlc
        $(STRIP) ${PKGDIR}/usr/lib/vlc
 
-.PHONY: build clean install
+.PHONY: build clean install install-plugins
 

diff --git a/ipkg/rules.h3600 b/ipkg/rules.h3600
new file mode 100755 (executable)
index 0000000..884b8fd
--- /dev/null
+++ b/ipkg/rules.h3600
@@ -0,0 +1,151 @@
+#!/usr/bin/make -f
+# debian/rules for the VideoLAN Client - uses debhelper.
+# based on Joey Hess's one.
+# Kludged for ipkg
+
+VERSION=0.7.1
+# Compilation options
+export CC=arm-linux-gcc
+export LD=arm-linux-ld
+export AR=arm-linux-ar
+export RANLIB=arm-linux-ranlib
+export STRIP=arm-linux-strip
+
+export VIDDIR="usr/share/vlc"
+export PIXDIR="usr/share/pixmaps"
+export DESTDIR=${HOME}/arm-linux
+export PKGDIR=${HOME}/packages/vlc-$(VERSION)
+
+export CONFIG_FLAGS="--enable-release --prefix=${HOME}/arm-linux/task-bootgpe2-v0.7.2-3600/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 \
+       --disable-skins \
+       --disable-skins2 \
+       --disable-sdl \
+       --enable-v4l \
+       --enable-sout \
+       --enable-dummy \
+       --enable-fb \
+       --enable-oss \
+       --disable-alsa \
+       --enable-x11 \
+       --disable-xvideo \
+       --disable-dvd \
+       --disable-dvdplay \
+       --disable-dvdread \
+       --disable-libcdio \
+       --disable-libcddb \
+       --disable-vcdx \
+       --disable-vcd \
+       --disable-maxosx \
+       --disable-goom \
+       --disable-speex \
+       --disable-visual \
+       --enable-freetype \
+       --disable-fribidi \
+       --disable-a52 \
+       --disable-faad \
+       --enable-flac \
+       --enable-libmpeg2 \
+       --enable-dvbpsi \
+       --disable-mkv \
+       --enable-mad \
+       --enable-id3tag \
+       --disable-ffmpeg \
+       --disable-slp \
+       --enable-pda \
+       --x-includes=${HOME}/arm-linux/task-bootgpe2-v0.7.2-3600/usr/X11R6/include \
+       --x-libraries=${HOME}/arm-linux/task-bootgpe2-v0.7.2-3600/usr/X11R6/lib \
+       --with-tuning=strongarm1100 \
+       --with-dvbpsi-tree=${HOME}/arm-linux/vlc-$(VERSION)/libdvbpsi-0.1.3 \
+       --with-mad-tree=${HOME}/arm-linux/vlc-$(VERSION)/libmad-0.15.0b \
+       --with-id3tag-tree=${HOME}/arm-linux/vlc-$(VERSION)/libid3tag-0.15.0b \
+       --with-libmpeg2-tree=${HOME}/arm-linux/vlc-$(VERSION)/mpeg2dec-0.4.0 \
+       --with-included-gettext=${HOME}/arm-linux/vlc-$(VERSION)/gettext-0.12.1 \
+       --with-v4l=${HOME}/arm-linux/vlc-$(VERSION)/linux/kernel"
+
+config:
+       ./configure --mandir=$${prefix}/share/man \
+               --infodir=$${prefix}/share/info \
+               --host=arm-linux \
+               --target=arm-linux \
+               $(shell echo $(CONFIG_FLAGS)) \
+       LDFLAGS="-L${HOME}/arm-linux/vlc-$(VERSION)/libid3tag-0.15.0b/.libs \
+               -L${HOME}/arm-linux/vlc-$(VERSION)/flac-1.1.0/src/libFLAC/.libs \
+               -L${HOME}/arm-linux/vlc-$(VERSION)/faac/libfaac/.libs \
+               -L${HOME}/arm-linux/vlc-$(VERSION)/libdvbpsi-0.1.3/src/.libs/ \
+               -L${HOME}/arm-linux/task-bootgpe2-v0.7.2-3600/lib \
+               -L${HOME}/arm-linux/task-bootgpe2-v0.7.2-3600/usr/lib \
+               -L${HOME}/arm-linux/task-bootgpe2-v0.7.2-3600/usr/X11R6/lib" \
+       CFLAGS="-I${HOME}/arm-linux/vlc-$(VERSION)/libid3tag-0.15.0b \
+               -I${HOME}/arm-linux/vlc-$(VERSION)/libdvbpsi-0.1.3  \
+               -I${HOME}/arm-linux/vlc-$(VERSION)/flac-1.1.0/include \
+               -I${HOME}/arm-linux/linux/kernel/include \
+               -I${HOME}/arm-linux/task-bootgpe2-v0.7.2-3600/include \
+               -I${HOME}/arm-linux/task-bootgpe2-v0.7.2-3600/usr/X11R6/include \
+               -I${HOME}/arm-linux/task-bootgpe2-v0.7.2-3600/usr/include"
+
+#patch:
+# This is ugly -- I know
+#      patch -p 0 < ipkg/patch
+
+build:
+       $(MAKE) LDFLAGS="-L${HOME}/arm-linux/task-bootgpe2-v0.7.2-3600/usr/X11R6/lib -lX11 -lXext -lXft -lXrender -lXrandr -lfontconfig -lexpat \
+               -L${HOME}/arm-linux/task-bootgpe2-v0.7.2-3600/lib \
+               -L${HOME}/arm-linux/task-bootgpe2-v0.7.2-3600/usr/lib -lfreetype\
+               -L${HOME}/arm-linux/vlc-$(VERSION)/libid3tag-0.15.0b/.libs \
+               -L${HOME}/arm-linux/vlc-$(VERSION)/libdvbpsi-0.1.3/src/.libs \
+               -L${HOME}/arm-linux/vlc-$(VERSION)/flac-1.1.0/src/libFLAC/.libs" \
+       CFLAGS="-I${HOME}/arm-linux/linux/kernel/include \
+               -I${HOME}/arm-linux/task-bootgpe2-v0.7.2-3600/usr/X11R6/include \
+               -I${HOME}/arm-linux/task-bootgpe2-v0.7.2-3600/include \
+               -I${HOME}/arm-linux/task-bootgpe2-v0.7.2-3600/usr/include \
+               -I${HOME}/arm-linux/vlc-$(VERSION)/libid3tag-0.15.0b \
+               -I${HOME}/arm-linux/vlc-$(VERSION)/libdvbpsi-0.1.3 \
+               -I${HOME}/arm-linux/vlc-$(VERSION)/flac-1.1.0/include" 
+
+clean:
+       -$(MAKE) distclean
+
+install: 
+       rm -fr ${PKGDIR}/
+       mkdir -p ${PKGDIR}/CONTROL
+       mkdir -p $(PKGDIR)/usr/bin
+       mkdir -p ${PKGDIR}/usr/share/vlc
+       mkdir -p ${PKGDIR}/usr/share/applications
+       mkdir -p ${PKGDIR}/usr/share/http/admin
+#      mkdir -p ${PKGDIR}/usr/share/skins/default
+       mkdir -p ${PKGDIR}/usr/lib/menu
+       mkdir -p ${PKGDIR}/usr/lib/vlc
+       $(STRIP) vlc
+       cp ipkg/control         $(PKGDIR)/CONTROL/control
+       cp ipkg/postinst        ${PKGDIR}/CONTROL/postinst
+       cp ipkg/postrm          ${PKGDIR}/CONTROL/postrm
+       cp share/pda-*          ${PKGDIR}/usr/share/vlc
+       cp share/vlc{16x16,48x48}*   ${PKGDIR}/usr/share/vlc
+       cp share/http/*.{html,css}         ${PKGDIR}/usr/share/http
+       cp share/http/admin/*.html         ${PKGDIR}/usr/share/http/admin
+#      cp share/skins/default/*.{bmp,xml} ${PKGDIR}/usr/share/skins/default
+       cp vlc                             $(PKGDIR)/usr/bin
+       cp ipkg/vlc.gpe ${PKGDIR}/usr/share/applications/vlc.desktop
+       make -C po DESTDIR=${PKGDIR} install
+       mv ${PKGDIR}/home/jpsaman/arm-linux/task-bootgpe2-v0.7.2-3600/usr/share/locale ${PKGDIR}/usr/share
+       [ -d ${PKGDIR} ] && rm -rf ${PKGDIR}/home
+
+install-plugins: install
+       find ./ -name *.so | xargs cp ${PKGDIR}/usr/lib/vlc
+       $(STRIP) ${PKGDIR}/usr/lib/vlc
+
+.PHONY: build clean install install-plugins
+