moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

Merge remote-tracking branch 'x/master'

Browse source 
* x/master:
  vlc: revbump due to ffmpeg abi change.
  ffmpeg: update to 0.8.6, ABI bump.
  alsa-plugins: revbump due to ffmpeg abi change.
  xbps-src: checkvers: also report revision in srcpkgs.
This commit is contained in:
davehome 2011-11-05 13:32:49 -06:00
commit a1e1c8c1e6
6 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
srcpkgs/alsa-plugins/template
View file

@ -1,7 +1,7 @@
# Template build file for 'alsa-plugins'. # Template build file for 'alsa-plugins'.
pkgname=alsa-plugins pkgname=alsa-plugins
version=1.0.24 # NOTE: Remove fix-jack-blocking-pipe.patch on next release! version=1.0.24 # NOTE: Remove fix-jack-blocking-pipe.patch on next release!
revision=4 revision=5
distfiles="ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$version.tar.bz2" distfiles="ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$version.tar.bz2"
build_style=gnu-configure build_style=gnu-configure
configure_args="--disable-maemo-plugin --with-speex=lib" configure_args="--disable-maemo-plugin --with-speex=lib"

2
srcpkgs/ffmpeg/depends
View file

@ -1,2 +1,2 @@
abi_depends=">=0.6" abi_depends=">=0.8.6"
api_depends="${abi_depends}" api_depends="${abi_depends}"

4
srcpkgs/ffmpeg/template
View file

@ -1,12 +1,12 @@
# Template file for 'ffmpeg' # Template file for 'ffmpeg'
pkgname=ffmpeg pkgname=ffmpeg
version=0.7.7 version=0.8.6
homepage="http://www.ffmpeg.org" homepage="http://www.ffmpeg.org"
distfiles="${homepage}/releases/ffmpeg-${version}.tar.bz2" distfiles="${homepage}/releases/ffmpeg-${version}.tar.bz2"
short_desc="Decoding, encoding and streaming software" short_desc="Decoding, encoding and streaming software"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3" license="GPL-3"
checksum=7231846b0d59d3fc3c0ed8370a35c823b59b84de3e92d2d8223b3bef3b92c8e1 checksum=0ec9084438a26514455d49a72008d0b563d5a3c9d137cd22e46cb86bdc8bf6f0
long_desc=" long_desc="
FFmpeg is the first complete and free Internet Live Audio and Video FFmpeg is the first complete and free Internet Live Audio and Video
Broadcasting solution. FFMpeg aims at being the command line tool to Broadcasting solution. FFMpeg aims at being the command line tool to

2
srcpkgs/vlc/template
View file

@ -1,7 +1,7 @@
# Template file for 'vlc' # Template file for 'vlc'
pkgname=vlc pkgname=vlc
version=1.1.12 version=1.1.12
revision=2 revision=3
distfiles="http://download.videolan.org/pub/videolan/vlc/$version/vlc-$version.tar.bz2" distfiles="http://download.videolan.org/pub/videolan/vlc/$version/vlc-$version.tar.bz2"
build_style=gnu-configure build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-snapshot configure_args="--disable-gme --disable-libtar --enable-snapshot

12
xbps-src/common/mapping_shlib_binpkg.txt
View file

@ -361,13 +361,13 @@ libgif.so.4 giflib giflib-devel
libungif.so.4 giflib giflib-devel libungif.so.4 giflib giflib-devel
libImlib2.so.1 imlib2 imlib2-devel libImlib2.so.1 imlib2 imlib2-devel
libmp3lame.so.0 lame lame-devel libmp3lame.so.0 lame lame-devel
libavdevice.so.52 libavdevice ffmpeg-devel libavdevice.so.53 libavdevice ffmpeg-devel
libavformat.so.52 libavformat ffmpeg-devel libavformat.so.53 libavformat ffmpeg-devel
libswscale.so.0 libswscale ffmpeg-devel libswscale.so.2 libswscale ffmpeg-devel
libpostproc.so.51 libpostproc ffmpeg-devel libpostproc.so.51 libpostproc ffmpeg-devel
libavcodec.so.52 libavcodec ffmpeg-devel libavcodec.so.53 libavcodec ffmpeg-devel
libavutil.so.50 libavutil ffmpeg-devel libavutil.so.51 libavutil ffmpeg-devel
libavfilter.so.1 libavfilter ffmpeg-devel libavfilter.so.2 libavfilter ffmpeg-devel
libSDL-1.2.so.0 SDL SDL-devel libSDL-1.2.so.0 SDL SDL-devel
libSDL_image-1.2.so.0 SDL_image SDL_image-devel libSDL_image-1.2.so.0 SDL_image SDL_image-devel
libx264.so.115 x264 x264-devel libx264.so.115 x264 x264-devel

6
xbps-src/shutils/check_installed_packages.sh
View file

@ -33,7 +33,7 @@ Add_dependency() {
check_installed_packages() check_installed_packages()
{ {
local f lpkgn lpkgver rv srcpkgver local f lpkgn lpkgver rv srcpkgver srcver
for f in $(${XBPS_BIN_CMD} list|awk '{print $1}'); do for f in $(${XBPS_BIN_CMD} list|awk '{print $1}'); do
lpkgn=$(${XBPS_PKGDB_CMD} getpkgname ${f}) lpkgn=$(${XBPS_PKGDB_CMD} getpkgname ${f})
@ -51,14 +51,16 @@ check_installed_packages()
. ${XBPS_SRCPKGDIR}/${lpkgn}/template . ${XBPS_SRCPKGDIR}/${lpkgn}/template
fi fi
if [ -n "$revision" ]; then if [ -n "$revision" ]; then
srcver="${version}_${revision}"
srcpkgver="${lpkgn}-${version}_${revision}" srcpkgver="${lpkgn}-${version}_${revision}"
else else
srcver="${version}"
srcpkgver="${lpkgn}-${version}" srcpkgver="${lpkgn}-${version}"
fi fi
${XBPS_CMPVER_CMD} ${f} ${srcpkgver} ${XBPS_CMPVER_CMD} ${f} ${srcpkgver}
rv=$? rv=$?
if [ $rv -eq 255 ]; then if [ $rv -eq 255 ]; then
echo "${lpkgn} ${lpkgver} ${version}" echo "${lpkgn} ${lpkgver} ${srcver}"
fi fi
unset pkgname version revision unset pkgname version revision
done done