Merge branch '3.0' into 3.1

This commit is contained in:
Fredrik Rinnestam 2014-07-11 19:59:44 +02:00
commit a74075d335
4 changed files with 6 additions and 6 deletions

View File

@ -26,8 +26,8 @@ drwxr-xr-x root/root usr/include/harfbuzz/
-rw-r--r-- root/root usr/include/harfbuzz/hb.h
drwxr-xr-x root/root usr/lib/
-rwxr-xr-x root/root usr/lib/libharfbuzz.la
lrwxrwxrwx root/root usr/lib/libharfbuzz.so -> libharfbuzz.so.0.929.0
lrwxrwxrwx root/root usr/lib/libharfbuzz.so.0 -> libharfbuzz.so.0.929.0
-rwxr-xr-x root/root usr/lib/libharfbuzz.so.0.929.0
lrwxrwxrwx root/root usr/lib/libharfbuzz.so -> libharfbuzz.so.0.930.0
lrwxrwxrwx root/root usr/lib/libharfbuzz.so.0 -> libharfbuzz.so.0.930.0
-rwxr-xr-x root/root usr/lib/libharfbuzz.so.0.930.0
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/harfbuzz.pc

View File

@ -1 +1 @@
6251eb6d57e8c4e9e855188dbbdf8b6d harfbuzz-0.9.29.tar.bz2
ba0b01d285d48f20834b7de9bb4fc435 harfbuzz-0.9.30.tar.bz2

View File

@ -4,7 +4,7 @@
# Depends on: cairo
name=harfbuzz
version=0.9.29
version=0.9.30
release=1
source=(http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-$version.tar.bz2)

View File

@ -1,7 +1,7 @@
# MPlayer system-wide configuration file
# refer to the mplayer manpage for more information
vo=xv
vo=vaapi,xv,x11
double=yes
ao=alsa
framedrop=yes