Update packaging scripts.

diff --git a/ipkg/control b/ipkg/control
index ef945cf3f7639e6ad817365a1e749c5d0f8a4457..e06644f59b75b2ae591c964ddd2a69081ffeb488 100644 (file)
--- a/ipkg/control
+++ b/ipkg/control
@@ -13,5 +13,5 @@ Description: VideoLAN Client is a free network-aware MPEG and DVD player.
  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 from the network or from a file, as well as direct DVD 
- playback. 
+ 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.gpe b/ipkg/control.gpe
index b0d193409f58f605a342c8ebca438cb5473fdcad..c9fec8e42f8d751ae75976b85e7dc3b35dce9d78 100644 (file)
--- a/ipkg/control.gpe
+++ b/ipkg/control.gpe
@@ -10,8 +10,7 @@ Depends: gpe, libc6, libsdl, libgpewidget0, 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 
- 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,
  as well as direct DVD playback. 

diff --git a/ipkg/postinst b/ipkg/postinst
new file mode 100755 (executable)
index 0000000..2eb38bb
--- /dev/null
+++ b/ipkg/postinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+ldconfig
+exit 0

diff --git a/ipkg/postrm b/ipkg/postrm
new file mode 100755 (executable)
index 0000000..2eb38bb
--- /dev/null
+++ b/ipkg/postrm
@@ -0,0 +1,3 @@
+#!/bin/sh
+ldconfig
+exit 0

diff --git a/ipkg/rules b/ipkg/rules
index 454ebf2c90be2d2f31b18039a92a9208800500f0..9600b3270373a24d1cddda2f3ac68cb1619d323f 100755 (executable)
--- a/ipkg/rules
+++ b/ipkg/rules
@@ -7,38 +7,79 @@
 export CC=arm-linux-gcc
 export LD=arm-linux-ld
 export STRIP=arm-linux-strip
-export CONFIG_FLAGS="--enable-release --prefix=/usr --disable-gtk --enable-fb --enable-sdl --disable-xvideo --disable-plugins --with-tuning=strongarm1100 --x-includes=/skiff/local/arm-linux/include --x-libraries=/skiff/local/arm-linux/lib/X11 --with-sdl-config-path=/skiff/local/bin --with-mad=/skiff/local/arm-linux"
+#export CONFIG_FLAGS="--enable-release --prefix=/usr --disable-gtk --enable-fb --enable-sdl --disable-xvideo --disable-plugins --with-tuning=strongarm1100 --x-includes=/skiff/local/arm-linux/include --x-libraries=/skiff/local/arm-linux/lib/X11 --with-sdl-config-path=/skiff/local/bin --with-mad=/skiff/local/arm-linux"
+
+export CONFIG_FLAGS="--enable-release --prefix=/usr \
+       --disable-plugins \
+       --disable-gtk \
+       --disable-gnome \
+       --disable-qt \
+       --disable-kde \
+       --disable-qte \
+       --enable-fb \
+       --enable-sdl \
+       --enable-oss \
+       --disable-alsa \
+       --disable-xvideo \
+       --disable-dvd \
+       --disable-dvdread \
+       --disable-vcd \
+       --disable-maxosx \
+       --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-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"
+
 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.5.0
 
-build: build-stamp
-build-stamp:
+config:
        ./configure --mandir=$${prefix}/share/man \
                --infodir=$${prefix}/share/info \
+               --host=arm-linux \
+               --target=arm-linux \
                $(shell echo $(CONFIG_FLAGS))
-
+patch:
 # This is ugly -- I know
        patch -p 0 < ipkg/patch
 
+build:
        $(MAKE)
 
-       touch build-stamp
-
 clean:
-       rm -f build-stamp
-
        -$(MAKE) distclean
 
 install: build
+       rm -f ${PKGDIR}/
+       mkdir -p ${PKGDIR}/CONTROL
        mkdir -p $(PKGDIR)/usr/bin
+       mkdir -p ${PKGDIR}/usr/share/vlc
+#      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/familiar-* ${PKGDIR}/usr/share/vlc
+       cp share/vlc32x32.xpm ${PKGDIR}/usr/share/vlc
+       cp share/vlc16x16.xpm  ${PKGDIR}/usr/share/vlc
+       cp share/vlc48x48.png  ${PKGDIR}/usr/share/vlc
        cp vlc $(PKGDIR)/usr/bin
+#      cp ipkg/vlc.gpe ${PKGDIR}/usr/lib/menu/vlc
 
 install-plugins: install
-       cp plugins/*.so ${PKGDIR}/usr/lib/vlc
+       find ./ -name *.so | xargs cp ${PKGDIR}/usr/lib/vlc
        $(STRIP) ${PKGDIR}/usr/lib/vlc
 
 .PHONY: build clean install