From: Jean-Paul Saman Date: Sun, 7 Dec 2003 18:52:40 +0000 (+0000) Subject: Updating makefiles and package scripts. X-Git-Tag: 0.7.0~195 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=28fe47165a21c6aef594fe6f92e4fe2191397e60;p=vlc Updating makefiles and package scripts. --- diff --git a/ipkg/control b/ipkg/control index 72c293eb5a..983f220d68 100644 --- a/ipkg/control +++ b/ipkg/control @@ -7,7 +7,7 @@ Architecture: arm Source: http://www.videolan.org/vlc/download-sources.html Conflicts: gpe-vlc, opie-vlc, opie-libsdl, opie-base Maintainer: Jean-Paul Saman -Depends: libc6, libsdl, libgtk1.2, 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 diff --git a/ipkg/postinst b/ipkg/postinst index 563d34e0fe..273d0cfed7 100755 --- a/ipkg/postinst +++ b/ipkg/postinst @@ -1,3 +1,3 @@ #!/bin/sh /sbin/ldconfig -exit 0 +exit $? diff --git a/ipkg/postinst.opie b/ipkg/postinst.opie index f3c862b1db..eb3f284f0e 100755 --- a/ipkg/postinst.opie +++ b/ipkg/postinst.opie @@ -3,4 +3,4 @@ if [ -x /usr/share/vlc ] ; then ln -s /usr/share/vlc /opt/QtPalmtop/pics/vlc fi -exit 0 +exit $? diff --git a/ipkg/postinst.zaurus b/ipkg/postinst.zaurus index 5e56b70e86..a835e11091 100755 --- a/ipkg/postinst.zaurus +++ b/ipkg/postinst.zaurus @@ -3,4 +3,4 @@ if [ -x /usr/share/vlc ] ; then ln -s /usr/share/vlc /opt/QtPalmtop/sharp/pics/vlc fi -exit 0 +exit $? diff --git a/ipkg/postrm b/ipkg/postrm index 563d34e0fe..273d0cfed7 100755 --- a/ipkg/postrm +++ b/ipkg/postrm @@ -1,3 +1,3 @@ #!/bin/sh /sbin/ldconfig -exit 0 +exit $? diff --git a/ipkg/postrm.opie b/ipkg/postrm.opie index b63a56c2cb..b76b42341a 100755 --- a/ipkg/postrm.opie +++ b/ipkg/postrm.opie @@ -1,5 +1,5 @@ #!/bin/sh /sbin/ldconfig [ -x /opt/QtPalmtop/pics/vlc ] || rm /opt/QtPalmtop/pics/vlc -exit 0 +exit $? diff --git a/ipkg/postrm.zaurus b/ipkg/postrm.zaurus index 97a2441cb7..ad18664cbd 100755 --- a/ipkg/postrm.zaurus +++ b/ipkg/postrm.zaurus @@ -1,5 +1,5 @@ #!/bin/sh /sbin/ldconfig [ -x /opt/QtPalmtop/sharp/pics/vlc ] || rm /opt/QtPalmtop/sharp/pics/vlc -exit 0 +exit $? diff --git a/ipkg/rules b/ipkg/rules index 44bf173067..cd48bc3420 100755 --- a/ipkg/rules +++ b/ipkg/rules @@ -11,6 +11,11 @@ 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/samba/jpsaman/src/ipaq/arm-linux +export PKGDIR=/home/samba/jpsaman/src/ipaq/packages/vlc-$(VERSION) + export CONFIG_FLAGS="--enable-release --prefix=/usr \ --disable-plugins \ --disable-gtk \ @@ -25,47 +30,47 @@ export CONFIG_FLAGS="--enable-release --prefix=/usr \ --disable-tarkin \ --disable-tremor \ --disable-theorea \ + --disable-skins \ + --disable-sdl \ --enable-v4l \ --enable-sout \ --enable-dummy \ --enable-fb \ - --enable-sdl \ --enable-oss \ --disable-alsa \ --enable-x11 \ --disable-xvideo \ --disable-dvd \ + --disable-dvdplay \ --disable-dvdread \ --disable-vcd \ --disable-maxosx \ - --disable-freetype \ + --enable-freetype \ --enable-a52 \ - --enable-faad2 \ + --enable-faad \ --enable-flac \ --enable-libmpeg2 \ --enable-libdvbpsi \ --disable-mkv \ --enable-mad \ --enable-ffmpeg \ + --enable-slp \ --enable-pda \ + --x-includes=/skiff/local/arm-linux/include/X11 \ + --x-libraries=/skiff/local/arm-linux/lib/X11 \ --with-tuning=strongarm1100 \ - --x-includes=/skiff/local/arm-linux/include \ - --x-libraries=/usr/local/arm/2.95.3/arm-linux/usr/X11R6/lib \ - --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/usr/bin \ - --with-sdl-prefix=/usr/local/arm/2.95.3/arm-linux/usr \ - --with-ffmpeg-tree=/home/jpsaman/iPaq/src/ffmpeg-20030622" - -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-$(VERSION) + --with-libdvbpsi-tree=/home/samba/jpsaman/src/ipaq/vlc-$(VERSION)/libdvbpsi-0.1.3 \ + --with-libiconv-prefix=/home/samba/jpsaman/src/ipaq/vlc-$(VERSION)/libiconv-1.9.1 \ + --with-mad-tree=/home/samba/jpsaman/src/ipaq/vlc-$(VERSION)/libmad-0.15.0b \ + --with-a52-tree=/home/samba/jpsaman/src/ipaq/vlc-$(VERSION)/a52dec-0.7.4 \ + --with-faad-tree=/home/samba/jpsaman/src/ipaq/vlc-$(VERSION)/faad2-2.0rc2 \ + --with-flac-tree=/home/samba/jpsaman/src/ipaq/vlc-$(VERSION)/flac-1.1.0 \ + --with-libmpeg2-tree=/home/samba/jpsaman/src/ipaq/vlc-$(VERSION)/mpeg2dec-20030612 \ + --with-slp=/home/samba/jpsaman/src/ipaq/vlc-$(VERSION)/openslp-1.0.11/libslp \ + --with-included-gettext=/home/samba/jpsaman/src/ipaq/vlc-$(VERSION)/gettext-0.12.1 \ + --with-v4l=/home/samba/jpsaman/src/ipaq/vlc-$(VERSION)/linux/kernel \ + --with-ffmpeg-mp3lame \ + --with-ffmpeg-tree=/home/samba/jpsaman/src/ipaq/vlc-$(VERSION)/ffmpeg-20030813" config: ./configure --mandir=$${prefix}/share/man \ @@ -73,15 +78,27 @@ 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/usr/lib" \ - CPPFLAGS="-I/usr/local/arm/2.95.3/arm-linux/include -I/usr/local/arm/2.95.3/arm-linux/usr/include" + LDFLAGS="-L/home/samba/jpsaman/src/ipaq/vlc-$(VERSION)/openslp-1.0.11/libslp/.libs \ + -L/home/samba/jpsaman/src/ipaq/vlc-$(VERSION)/libpng-1.2.5 \ + -L/home/samba/jpsaman/src/ipaq/vlc-$(VERSION)/lame-3.93.1/libmp3lame/.libs \ + -L/home/samba/jpsaman/src/ipaq/vlc-$(VERSION)/zlib-1.1.4 \ + -L/home/samba/jpsaman/src/ipaq/vlc-$(VERSION)/freetype-2.1.4/objs \ + -L/home/samba/jpsaman/src/ipaq/vlc-$(VERSION)/libid3-0.15.0b" \ + CPPFLAGS="-I/home/samba/jpsaman/src/ipaq/vlc-$(VERSION)/openslp-1.0.11/libslp \ + -I/home/samba/jpsaman/src/ipaq/vlc-$(VERSION)/libpng-1.2.5 \ + -I/home/samba/jpsaman/src/ipaq/vlc-$(VERSION)/lame-3.93.1/include \ + -I/home/samba/jpsaman/src/ipaq/vlc-$(VERSION)/zlib-1.1.4 \ + -I/home/samba/jpsaman/src/ipaq/vlc-$(VERSION)/freetype-2.1.4/include \ + -I/home/samba/jpsaman/src/ipaq/vlc-$(VERSION)/libid3-0.15.0b" +# park here ;-) +# -I/home/samba/jpsaman/src/ipaq/linux/kernel/include \ #patch: # This is ugly -- I know # patch -p 0 < ipkg/patch build: - $(MAKE) + $(MAKE) LDFLAGS="-L/skiff/local/arm-linux/libs" CFLAGS="-I/skiff/local/arm-linux/include" clean: -$(MAKE) distclean @@ -91,18 +108,27 @@ install: build 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/share/locale + for loc in de en_GB fr it ja nl no ru sv ; do + mkdir -p ${PKGDIR}/usr/share/locale/$loc/LC_MESSAGES + done + 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/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 share/pda-* ${PKGDIR}/usr/share/vlc + cp share/vlc* ${PKGDIR}/usr/share/vlc + cp share/http/* ${PKGDIR}/usr/share/http + cp share/http/admin/* ${PKGDIR}/usr/share/http/admin + cp share/skins/default/* ${PKGDIR}/usr/share/skins/default cp vlc $(PKGDIR)/usr/bin -# cp ipkg/vlc.gpe ${PKGDIR}/usr/lib/menu/vlc + cp ipkg/vlc.gpe ${PKGDIR}/usr/share/applications/vlc.desktop + make -C po DESTDIR=${PKGDIR} install install-plugins: install find ./ -name *.so | xargs cp ${PKGDIR}/usr/lib/vlc diff --git a/ipkg/vlc.gpe b/ipkg/vlc.gpe index 10ce6aa764..3991432c3b 100755 --- a/ipkg/vlc.gpe +++ b/ipkg/vlc.gpe @@ -1,9 +1,7 @@ -?package(vlc): \ - needs=x11 \ - section="Graphics" \ - logtitle="VideoLAN Client" \ - title="VideoLAN Client" \ - command="vlc"\ - icon48=/usr/share/vlc/vlc48x48.png \ - windowtitle="VideoLAN Client" +[Desktop Entry] +Name=VLC MediaPlayer +Comment=Media Player with network and multiple codec support +Exec=vlc +Type=Application +Icon=/usr/share/vlc/vlc48x48.png