X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ipkg%2Frules;h=2cf5a2bfb45182106b28e762cc5a992976b908d7;hb=95b4a56a03d74780366bbf13cf12e834f84e3a2c;hp=454ebf2c90be2d2f31b18039a92a9208800500f0;hpb=34146983af6197c5d467c787990c770f81728342;p=vlc

diff --git a/ipkg/rules b/ipkg/rules
index 454ebf2c90..2cf5a2bfb4 100755
--- a/ipkg/rules
+++ b/ipkg/rules
@@ -6,39 +6,85 @@
 # 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 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 \
+	--disable-xosd \
+	--enable-dummy \
+	--enable-fb \
+	--enable-sdl \
+	--enable-oss \
+	--disable-alsa \
+	--enable-x11 \
+	--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/svn/ipaq/Work/ffmpeg"
+#	--with-ffmpeg-tree=/home/jpsaman/iPaq/src/ffmpeg"
+
 export VIDDIR="usr/share/vlc"
 export PIXDIR="usr/share/pixmaps"
-export DESTDIR=/tmp/vlc
+#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/vlc-0.5.3
 
-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
+#	patch -p 0 < ipkg/patch
 
+build:
 	$(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/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