Merge remote-tracking branch 'x/master'

* x/master:
  ffmpeg: update to 0.7.7.
  xorg-server: update to 1.11.2.
This commit is contained in:
davehome 2011-11-05 04:00:38 -06:00
commit 97707ef289
11 changed files with 5 additions and 20 deletions

View file

@ -5,7 +5,6 @@ long_desc="${long_desc}
This package contains files for development, headers, static libs, etc." This package contains files for development, headers, static libs, etc."
revision=2
Add_dependency run alsa-lib-devel Add_dependency run alsa-lib-devel
Add_dependency run libXext-devel Add_dependency run libXext-devel

View file

@ -6,7 +6,6 @@ long_desc="
It supports most existing codecs (MPEG, MPEG2, MPEG4, AC3, DV...)." It supports most existing codecs (MPEG, MPEG2, MPEG4, AC3, DV...)."
revision=1
Add_dependency run zlib Add_dependency run zlib
Add_dependency run glibc Add_dependency run glibc

View file

@ -4,7 +4,6 @@ short_desc="FFmpeg device handling library"
long_desc=" long_desc="
This is the device handling library from FFmpeg." This is the device handling library from FFmpeg."
revision=2
Add_dependency run libavformat Add_dependency run libavformat
Add_dependency run libavcodec Add_dependency run libavcodec

View file

@ -4,7 +4,6 @@ short_desc="FFmpeg audio/video filter library"
long_desc=" long_desc="
This is the audio/video filter library from FFmpeg." This is the audio/video filter library from FFmpeg."
revision=1
Add_dependency run glibc Add_dependency run glibc
Add_dependency run libavformat Add_dependency run libavformat

View file

@ -6,7 +6,6 @@ long_desc="
It supports most existing file formats (AVI, MPEG, OGG, Matroska, ASF...)." It supports most existing file formats (AVI, MPEG, OGG, Matroska, ASF...)."
revision=1
Add_dependency run libavcodec Add_dependency run libavcodec
Add_dependency run libavutil Add_dependency run libavutil

View file

@ -5,7 +5,6 @@ long_desc="
This is the common utility library from FFmpeg. It contains shared code used This is the common utility library from FFmpeg. It contains shared code used
by all other ffmpeg libraries." by all other ffmpeg libraries."
revision=1
Add_dependency run glibc Add_dependency run glibc

View file

@ -4,7 +4,6 @@ short_desc="FFmpeg video postprocessing library"
long_desc=" long_desc="
This is the video postprocessing library from FFmpeg." This is the video postprocessing library from FFmpeg."
revision=1
Add_dependency run libavutil Add_dependency run libavutil
Add_dependency run glibc Add_dependency run glibc

View file

@ -4,7 +4,6 @@ short_desc="FFmpeg video scaling library"
long_desc=" long_desc="
This is the video software scaling library from FFmpeg." This is the video software scaling library from FFmpeg."
revision=1
Add_dependency run libavutil Add_dependency run libavutil
Add_dependency run glibc Add_dependency run glibc

View file

@ -1,13 +1,12 @@
# Template file for 'ffmpeg' # Template file for 'ffmpeg'
pkgname=ffmpeg pkgname=ffmpeg
version=0.7.6 version=0.7.7
revision=2
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=f23265dc55fa8424872bc6cd026e340a367bc7eb4d5a6a32ca4aacb581b13cc2 checksum=7231846b0d59d3fc3c0ed8370a35c823b59b84de3e92d2d8223b3bef3b92c8e1
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

View file

@ -1,7 +1,6 @@
# Template build file for 'xorg-server'. # Template build file for 'xorg-server'.
pkgname=xorg-server pkgname=xorg-server
version=1.11.1 version=1.11.2
revision=2
distfiles="${XORG_SITE}/xserver/$pkgname-$version.tar.bz2" distfiles="${XORG_SITE}/xserver/$pkgname-$version.tar.bz2"
build_style=gnu-configure build_style=gnu-configure
configure_args="--enable-ipv6 configure_args="--enable-ipv6
@ -14,7 +13,7 @@ short_desc="Modular X11 server from modular X.org"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org" homepage="http://xorg.freedesktop.org"
license="MIT/X11, BSD" license="MIT/X11, BSD"
checksum=c069c177d9a80bca2ee1d49aa1af6d9f996c83e4ff12393cab2ca3f8817276f6 checksum=fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2
long_desc=" long_desc="
The X11 server from the modularized source tree of X.org." The X11 server from the modularized source tree of X.org."
@ -32,7 +31,6 @@ Add_dependency run libXau
Add_dependency run pixman Add_dependency run pixman
Add_dependency run libXdmcp Add_dependency run libXdmcp
Add_dependency run libdrm Add_dependency run libdrm
Add_dependency run libGL
# Not a direct dependency, but it's required for DRI to work. # Not a direct dependency, but it's required for DRI to work.
Add_dependency run MesaLib Add_dependency run MesaLib

View file

@ -1,6 +1,6 @@
# Template file for 'xorg-server-devel'. # Template file for 'xorg-server-devel'.
# #
short_desc="${sourcepkg} development files" short_desc="${sourcepkg} - development files"
long_desc="${long_desc} long_desc="${long_desc}
This package contains files for development, headers, static libs, etc." This package contains files for development, headers, static libs, etc."
@ -23,18 +23,14 @@ Add_dependency run libXfont-devel
Add_dependency run libXau-devel Add_dependency run libXau-devel
Add_dependency run pixman-devel Add_dependency run pixman-devel
Add_dependency run libXdmcp-devel Add_dependency run libXdmcp-devel
Add_dependency run openssl-devel
Add_dependency run libXmu-devel Add_dependency run libXmu-devel
Add_dependency run libXrender-devel Add_dependency run libXrender-devel
Add_dependency run libXfixes-devel Add_dependency run libXfixes-devel
Add_dependency run libXi-devel Add_dependency run libXi-devel
Add_dependency run libXaw-devel Add_dependency run libXaw-devel
Add_dependency run libXt-devel Add_dependency run libXt-devel
Add_dependency run libSM-devel
Add_dependency run libICE-devel
Add_dependency run libXpm-devel Add_dependency run libXpm-devel
Add_dependency run libdrm-devel Add_dependency run libdrm-devel
Add_dependency run MesaLib-devel
do_install() do_install()
{ {