Packaging files for Familiar GPE and OPIE releases.

diff --git a/ipkg/postinst.opie b/ipkg/postinst.opie
index f2bb784c0733329dc4866764e0c44f134350f2fd..253d06583c87621ba16c586f80edae23cf56f160 100755 (executable)
--- a/ipkg/postinst.opie
+++ b/ipkg/postinst.opie
@@ -1,6 +1,6 @@
 #!/bin/sh
 ldconfig
-if [ -x /usr/share/videolan ] ; then
-   ln -s /usr/share/videolan /opt/QtPalmtop/pics/videolan
+if [ -x /usr/share/vlc ] ; then
+   ln -s /usr/share/vlc /opt/QtPalmtop/pics/vlc
 fi
 exit 0

diff --git a/ipkg/postrm.opie b/ipkg/postrm.opie
index ef9f42cb12eb0c56a6d8f415163512684fb58a00..d43c38afbc351c965a7a1550f4caf6c3d21dd481 100755 (executable)
--- a/ipkg/postrm.opie
+++ b/ipkg/postrm.opie
@@ -1,5 +1,5 @@
 #!/bin/sh
 ldconfig
-[ -x /opt/QtPalmtop/pics/videolan ] || rm /opt/QtPalmtop/pics/videolan
+[ -x /opt/QtPalmtop/pics/vlc ] || rm /opt/QtPalmtop/pics/vlc
 exit 0
 

diff --git a/ipkg/rules b/ipkg/rules
index 470e2d0c80261dea439e5611434126d761646766..454ebf2c90be2d2f31b18039a92a9208800500f0 100755 (executable)
--- a/ipkg/rules
+++ b/ipkg/rules
@@ -8,7 +8,7 @@ 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 VIDDIR="usr/share/videolan"
+export VIDDIR="usr/share/vlc"
 export PIXDIR="usr/share/pixmaps"
 export DESTDIR=/tmp/vlc
 export DESTDIR=/usr/local/arm/2.95.3/arm-linux
@@ -38,8 +38,8 @@ install: build
        cp vlc $(PKGDIR)/usr/bin
 
 install-plugins: install
-       cp plugins/*.so ${PKGDIR}/usr/lib/videolan/vlc
-       $(STRIP) ${PKGDIR}/usr/lib/videolan/vlc
+       cp plugins/*.so ${PKGDIR}/usr/lib/vlc
+       $(STRIP) ${PKGDIR}/usr/lib/vlc
 
 .PHONY: build clean install
 

diff --git a/ipkg/rules.gpe b/ipkg/rules.gpe
index b17b8e98f7672661222f29ec14c2977e545dc761..c30fbb33cec6088aad28758a2442862666fd0d89 100755 (executable)
--- a/ipkg/rules.gpe
+++ b/ipkg/rules.gpe
@@ -39,11 +39,11 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \
        --with-sdl-prefix=/usr/local/arm/2.95.3/arm-linux/usr \
        --with-ffmpeg-tree=/home/jpsaman/iPaq/src/ffmpeg"
 
-export VIDDIR="usr/share/videolan"
+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
+export PKGDIR=/home/jpsaman/iPaq/packages/gpe-vlc-0.5.0
 
 build: build-stamp
 config:
@@ -55,37 +55,32 @@ config:
 build-stamp:
 # This is ugly -- I know
 #      patch -p 0 < ipkg/patch
-
        $(MAKE)
 
-       touch build-stamp
-
 clean:
-       rm -f build-stamp
-
        -$(MAKE) distclean
 
 install: build
        rm -fr ${PKGDIR}/
        mkdir -p ${PKGDIR}/CONTROL
        mkdir -p $(PKGDIR)/usr/bin
-       mkdir -p ${PKGDIR}/usr/share/videolan
+       mkdir -p ${PKGDIR}/usr/share/vlc
        mkdir -p ${PKGDIR}/usr/lib/menu
-       mkdir -p ${PKGDIR}/usr/lib/videolan/vlc
+       mkdir -p ${PKGDIR}/usr/lib/vlc
        $(STRIP) vlc
        cp ipkg/control.gpe $(PKGDIR)/CONTROL/control
        cp ipkg/postinst.gpe ${PKGDIR}/CONTROL/postinst
        cp ipkg/postrm.gpe ${PKGDIR}/CONTROL/postrm
-       cp share/familiar-* ${PKGDIR}/usr/share/videolan
-       cp share/vlc32x32.xpm ${PKGDIR}/usr/share/videolan
-       cp share/vlc16x16.xpm  ${PKGDIR}/usr/share/videolan
-       cp share/vlc48x48.png  ${PKGDIR}/usr/share/videolan
+       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/videolan/vlc
-       $(STRIP) ${PKGDIR}/usr/lib/videolan/vlc
+       find ./ -name *.so | xargs cp ${PKGDIR}/usr/lib/vlc
+       $(STRIP) ${PKGDIR}/usr/lib/vlc
 
 .PHONY: build clean install
 

diff --git a/ipkg/rules.opie b/ipkg/rules.opie
index a22350ae9c181b3cf1db44cbbf66ec58e9efc002..1f49baf11bb91a8974d4e4a2d40fc3c289e3f20b 100755 (executable)
--- a/ipkg/rules.opie
+++ b/ipkg/rules.opie
@@ -36,7 +36,7 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \
        --with-qte=/usr/local/arm/2.95.3/arm-linux/opt/QtPalmtop \
        --with-ffmpeg-tree=/home/jpsaman/iPaq/src/ffmpeg"
 
-export VIDDIR="usr/share/videolan"
+export VIDDIR="usr/share/vlc"
 export PIXDIR="usr/share/pixmaps"
 #export DESTDIR=/tmp/vlc
 export DESTDIR=/usr/local/arm/2.95.3/arm-linux
@@ -65,23 +65,23 @@ install: build
        rm -fr ${PKGDIR}/
        mkdir -p ${PKGDIR}/CONTROL
        mkdir -p $(PKGDIR)/usr/bin
-       mkdir -p ${PKGDIR}/usr/share/videolan
+       mkdir -p ${PKGDIR}/usr/share/vlc
        mkdir -p ${PKGDIR}/usr/lib/menu
-       mkdir -p ${PKGDIR}/usr/lib/videolan/vlc
+       mkdir -p ${PKGDIR}/usr/lib/vlc
        mkdir -p ${PKGDIR}/opt/QtPalmtop/bin
        mkdir -p ${PKGDIR}/opt/QtPalmtop/apps/Applications
        $(STRIP) vlc
        cp ipkg/control.opie $(PKGDIR)/CONTROL/control
        cp ipkg/postinst.opie ${PKGDIR}/CONTROL/postinst
        cp ipkg/postrm.opie ${PKGDIR}/CONTROL/postrm
-       cp share/vlc48x48.png  ${PKGDIR}/usr/share/videolan
+       cp share/vlc48x48.png  ${PKGDIR}/usr/share/vlc
        cp vlc $(PKGDIR)/usr/bin
        cp ipkg/vlc.opie ${PKGDIR}/opt/QtPalmtop/bin/opie-vlc
        cp ipkg/vlc.desktop ${PKGDIR}/opt/QtPalmtop/apps/Applications
 
 install-plugins: install
-       cp plugins/*.so ${PKGDIR}/usr/lib/videolan/vlc
-       $(STRIP) ${PKGDIR}/usr/lib/videolan/vlc
+       cp plugins/*.so ${PKGDIR}/usr/lib/vlc
+       $(STRIP) ${PKGDIR}/usr/lib/vlc
 
 .PHONY: build clean install
 

diff --git a/ipkg/vlc.desktop b/ipkg/vlc.desktop
index 4766d17331cd52d767f749120a047afeeb8cbdde..ce563cfa4f259faa360f3d098e70d5a409a0ca79 100644 (file)
--- a/ipkg/vlc.desktop
+++ b/ipkg/vlc.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
 Comment=Multiplatform Multimedia Player
 Exec=opie-vlc
-Icon=videolan/vlc48x48.png
+Icon=vlc/vlc48x48.png
 Name=VideoLAN Client