wok diff libvalhalla/receipt @ rev 17543

Up busybox (1.23.1)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Jan 27 16:55:03 2015 +0100 (2015-01-27)
parents 1204cf352c74
children 17e313b5b9c1
line diff
     1.1 --- a/libvalhalla/receipt	Sat Mar 29 03:04:46 2014 +0100
     1.2 +++ b/libvalhalla/receipt	Tue Jan 27 16:55:03 2015 +0100
     1.3 @@ -9,33 +9,36 @@
     1.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
     1.5  WEB_SITE="http://libvalhalla.geexbox.org/"
     1.6  WGET_URL="http://libvalhalla.geexbox.org/releases/$TARBALL"
     1.7 -#HOST_ARCH="i486 arm"
     1.8 +HOST_ARCH="i486 arm"
     1.9  
    1.10 -DEPENDS="ffmpeg ffmpeg-compat libexif sqlite libxml2 libgcrypt libcurl libcrypto"
    1.11 -BUILD_DEPENDS="ffmpeg-compat-dev sqlite-dev libxml2-dev libexif-dev curl-dev"
    1.12 +DEPENDS="ffmpeg ffmpeg-compat libexif libsqlite libxml2 libgcrypt libcurl \
    1.13 +libcrypto"
    1.14 +BUILD_DEPENDS="ffmpeg-dev ffmpeg-compat-dev libsqlite sqlite-dev \
    1.15 +libxml2-dev libexif-dev curl-dev"
    1.16 +
    1.17 +# Handle cross compilation
    1.18 +case "$ARCH" in
    1.19 +	i?86)
    1.20 +		#export LDFLAGS="-lavformat"
    1.21 +		export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig
    1.22 +		export LDFLAGS="-Wl,-rpath=/usr/lib/ffmpeg-compat" ;;
    1.23 +	arm*)
    1.24 +		export PKG_CONFIG_PATH=/cross/$ARCH/sysroot/usr/lib/ffmpeg-compat/pkgconfig
    1.25 +		export LDFLAGS="-Wl,-rpath=/cross/$ARCH/sysroot/usr/lib/ffmpeg-compat"
    1.26 +		export CFLAGS="$CFLAFS -I/cross/$ARCH/sysroot/usr/include/ffmpeg-compat"
    1.27 +		export LDFLAGS="-L/cross/$ARCH/sysroot/usr/lib/ffmpeg-compat -lavformat" 
    1.28 +		ARCH_ARGS="--cross-compile" ;;
    1.29 +esac
    1.30  
    1.31  # Rules to configure and make the package.
    1.32  compile_rules()
    1.33  {
    1.34 -	export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig
    1.35 -	export LDFLAGS="-Wl,-rpath=/usr/lib/ffmpeg-compat"
    1.36  	# Fix Busybox cat
    1.37 -	sed -i 's/cat -n/awk '"'"'{ printf "%6d  %s\\n",++n,$0 }'"'"' </' configure
    1.38 -	
    1.39 -	##export LDFLAGS="-lavformat"
    1.40 -	#sed -i '/prealloced_context/d' src/lavf_utils.c
    1.41 -	#sed -i 's/AVFormatParameters /AVDictionary */' src/lavf_utils.c
    1.42 -	#sed -i 's/av_open_input_file\(.*, \)0, \(.*\)$/avformat_open_input\1\2/' src/lavf_utils.c
    1.43 -	#sed -i '/av_metadata_get/d' configure
    1.44 -	#sed -i 's/av_metadata_get/av_dict_get/' configure src/parser.c
    1.45 -	#sed -i 's/AVMetadataTag/AVDictionaryEntry/' src/parser.c
    1.46 -	## Fix build with curl >= 7.21.2
    1.47 -	#sed -i '/#include <curl\/types.h>/d' src/url_utils.c
    1.48 -	## Fix configure for GCC 4.5.0
    1.49 -	#sed -i 's/"\$@" >>\$logfile 2/$@ >>$logfile 2/' configure
    1.50 +	sed -i 's/cat -n/awk '"'"'{ printf "%6d  %s\\n",++n,$0 }'"'"' </' \
    1.51 +		configure
    1.52  	
    1.53  	./configure \
    1.54 -		--prefix=/usr &&
    1.55 +		--prefix=/usr ${ARCH_ARGS} &&
    1.56  	make && make install
    1.57  }
    1.58