Merge branch '3.1' into 3.2
This commit is contained in:
commit
369fee415e
@ -1 +1 @@
|
||||
d8a7c1d70dbed5dae66620227954ed90 ccache-3.2.1.tar.xz
|
||||
1781eec25073765828b874004d944c53 ccache-3.2.4.tar.xz
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
# Depends on: zlib
|
||||
|
||||
name=ccache
|
||||
version=3.2.1
|
||||
version=3.2.4
|
||||
release=1
|
||||
source=(http://samba.org/ftp/$name/$name-$version.tar.xz)
|
||||
|
||||
|
||||
@ -20,6 +20,7 @@ drwxr-xr-x root/root usr/include/
|
||||
-rw-r--r-- root/root usr/include/dwarf.h
|
||||
drwxr-xr-x root/root usr/include/elfutils/
|
||||
-rw-r--r-- root/root usr/include/elfutils/elf-knowledge.h
|
||||
-rw-r--r-- root/root usr/include/elfutils/known-dwarf.h
|
||||
-rw-r--r-- root/root usr/include/elfutils/libasm.h
|
||||
-rw-r--r-- root/root usr/include/elfutils/libdw.h
|
||||
-rw-r--r-- root/root usr/include/elfutils/libdwelf.h
|
||||
@ -31,40 +32,40 @@ drwxr-xr-x root/root usr/include/elfutils/
|
||||
-rw-r--r-- root/root usr/include/nlist.h
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
drwxr-xr-x root/root usr/lib/elfutils/
|
||||
-rwxr-xr-x root/root usr/lib/elfutils/libebl_aarch64-0.161.so
|
||||
lrwxrwxrwx root/root usr/lib/elfutils/libebl_aarch64.so -> libebl_aarch64-0.161.so
|
||||
-rwxr-xr-x root/root usr/lib/elfutils/libebl_alpha-0.161.so
|
||||
lrwxrwxrwx root/root usr/lib/elfutils/libebl_alpha.so -> libebl_alpha-0.161.so
|
||||
-rwxr-xr-x root/root usr/lib/elfutils/libebl_arm-0.161.so
|
||||
lrwxrwxrwx root/root usr/lib/elfutils/libebl_arm.so -> libebl_arm-0.161.so
|
||||
-rwxr-xr-x root/root usr/lib/elfutils/libebl_i386-0.161.so
|
||||
lrwxrwxrwx root/root usr/lib/elfutils/libebl_i386.so -> libebl_i386-0.161.so
|
||||
-rwxr-xr-x root/root usr/lib/elfutils/libebl_ia64-0.161.so
|
||||
lrwxrwxrwx root/root usr/lib/elfutils/libebl_ia64.so -> libebl_ia64-0.161.so
|
||||
-rwxr-xr-x root/root usr/lib/elfutils/libebl_ppc-0.161.so
|
||||
lrwxrwxrwx root/root usr/lib/elfutils/libebl_ppc.so -> libebl_ppc-0.161.so
|
||||
-rwxr-xr-x root/root usr/lib/elfutils/libebl_ppc64-0.161.so
|
||||
lrwxrwxrwx root/root usr/lib/elfutils/libebl_ppc64.so -> libebl_ppc64-0.161.so
|
||||
-rwxr-xr-x root/root usr/lib/elfutils/libebl_s390-0.161.so
|
||||
lrwxrwxrwx root/root usr/lib/elfutils/libebl_s390.so -> libebl_s390-0.161.so
|
||||
-rwxr-xr-x root/root usr/lib/elfutils/libebl_sh-0.161.so
|
||||
lrwxrwxrwx root/root usr/lib/elfutils/libebl_sh.so -> libebl_sh-0.161.so
|
||||
-rwxr-xr-x root/root usr/lib/elfutils/libebl_sparc-0.161.so
|
||||
lrwxrwxrwx root/root usr/lib/elfutils/libebl_sparc.so -> libebl_sparc-0.161.so
|
||||
-rwxr-xr-x root/root usr/lib/elfutils/libebl_tilegx-0.161.so
|
||||
lrwxrwxrwx root/root usr/lib/elfutils/libebl_tilegx.so -> libebl_tilegx-0.161.so
|
||||
-rwxr-xr-x root/root usr/lib/elfutils/libebl_x86_64-0.161.so
|
||||
lrwxrwxrwx root/root usr/lib/elfutils/libebl_x86_64.so -> libebl_x86_64-0.161.so
|
||||
-rwxr-xr-x root/root usr/lib/libasm-0.161.so
|
||||
-rwxr-xr-x root/root usr/lib/elfutils/libebl_aarch64-0.164.so
|
||||
lrwxrwxrwx root/root usr/lib/elfutils/libebl_aarch64.so -> libebl_aarch64-0.164.so
|
||||
-rwxr-xr-x root/root usr/lib/elfutils/libebl_alpha-0.164.so
|
||||
lrwxrwxrwx root/root usr/lib/elfutils/libebl_alpha.so -> libebl_alpha-0.164.so
|
||||
-rwxr-xr-x root/root usr/lib/elfutils/libebl_arm-0.164.so
|
||||
lrwxrwxrwx root/root usr/lib/elfutils/libebl_arm.so -> libebl_arm-0.164.so
|
||||
-rwxr-xr-x root/root usr/lib/elfutils/libebl_i386-0.164.so
|
||||
lrwxrwxrwx root/root usr/lib/elfutils/libebl_i386.so -> libebl_i386-0.164.so
|
||||
-rwxr-xr-x root/root usr/lib/elfutils/libebl_ia64-0.164.so
|
||||
lrwxrwxrwx root/root usr/lib/elfutils/libebl_ia64.so -> libebl_ia64-0.164.so
|
||||
-rwxr-xr-x root/root usr/lib/elfutils/libebl_ppc-0.164.so
|
||||
lrwxrwxrwx root/root usr/lib/elfutils/libebl_ppc.so -> libebl_ppc-0.164.so
|
||||
-rwxr-xr-x root/root usr/lib/elfutils/libebl_ppc64-0.164.so
|
||||
lrwxrwxrwx root/root usr/lib/elfutils/libebl_ppc64.so -> libebl_ppc64-0.164.so
|
||||
-rwxr-xr-x root/root usr/lib/elfutils/libebl_s390-0.164.so
|
||||
lrwxrwxrwx root/root usr/lib/elfutils/libebl_s390.so -> libebl_s390-0.164.so
|
||||
-rwxr-xr-x root/root usr/lib/elfutils/libebl_sh-0.164.so
|
||||
lrwxrwxrwx root/root usr/lib/elfutils/libebl_sh.so -> libebl_sh-0.164.so
|
||||
-rwxr-xr-x root/root usr/lib/elfutils/libebl_sparc-0.164.so
|
||||
lrwxrwxrwx root/root usr/lib/elfutils/libebl_sparc.so -> libebl_sparc-0.164.so
|
||||
-rwxr-xr-x root/root usr/lib/elfutils/libebl_tilegx-0.164.so
|
||||
lrwxrwxrwx root/root usr/lib/elfutils/libebl_tilegx.so -> libebl_tilegx-0.164.so
|
||||
-rwxr-xr-x root/root usr/lib/elfutils/libebl_x86_64-0.164.so
|
||||
lrwxrwxrwx root/root usr/lib/elfutils/libebl_x86_64.so -> libebl_x86_64-0.164.so
|
||||
-rwxr-xr-x root/root usr/lib/libasm-0.164.so
|
||||
-rw-r--r-- root/root usr/lib/libasm.a
|
||||
lrwxrwxrwx root/root usr/lib/libasm.so -> libasm.so.1
|
||||
lrwxrwxrwx root/root usr/lib/libasm.so.1 -> libasm-0.161.so
|
||||
-rwxr-xr-x root/root usr/lib/libdw-0.161.so
|
||||
lrwxrwxrwx root/root usr/lib/libasm.so.1 -> libasm-0.164.so
|
||||
-rwxr-xr-x root/root usr/lib/libdw-0.164.so
|
||||
-rw-r--r-- root/root usr/lib/libdw.a
|
||||
lrwxrwxrwx root/root usr/lib/libdw.so -> libdw.so.1
|
||||
lrwxrwxrwx root/root usr/lib/libdw.so.1 -> libdw-0.161.so
|
||||
lrwxrwxrwx root/root usr/lib/libdw.so.1 -> libdw-0.164.so
|
||||
-rw-r--r-- root/root usr/lib/libebl.a
|
||||
-rwxr-xr-x root/root usr/lib/libelf-0.161.so
|
||||
-rwxr-xr-x root/root usr/lib/libelf-0.164.so
|
||||
-rw-r--r-- root/root usr/lib/libelf.a
|
||||
lrwxrwxrwx root/root usr/lib/libelf.so -> libelf.so.1
|
||||
lrwxrwxrwx root/root usr/lib/libelf.so.1 -> libelf-0.161.so
|
||||
lrwxrwxrwx root/root usr/lib/libelf.so.1 -> libelf-0.164.so
|
||||
|
||||
@ -1 +1 @@
|
||||
e1b9847c9a6a1ad340de8d47a863ec52 elfutils-0.161.tar.bz2
|
||||
2e4536c1c48034f188a80789a59114d8 elfutils-0.164.tar.bz2
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
# Depends on: bzip2 xz zlib
|
||||
|
||||
name=elfutils
|
||||
version=0.161
|
||||
version=0.164
|
||||
release=1
|
||||
source=(https://fedorahosted.org/releases/e/l/$name/$version/$name-$version.tar.bz2)
|
||||
|
||||
|
||||
@ -1,2 +1 @@
|
||||
13b5c214cee8373464d3d65dee362cdd flac-1.3.0.tar.xz
|
||||
422bd38d16a46b29a88724e7a2c75d4c flac-realloc.patch
|
||||
b9922c9a0378c88d3e901b234f852698 flac-1.3.1.tar.xz
|
||||
|
||||
@ -5,16 +5,13 @@
|
||||
# Depends on: libogg
|
||||
|
||||
name=flac
|
||||
version=1.3.0
|
||||
version=1.3.1
|
||||
release=1
|
||||
source=(http://downloads.xiph.org/releases/flac/$name-$version.tar.xz
|
||||
flac-realloc.patch)
|
||||
source=(http://downloads.xiph.org/releases/flac/$name-$version.tar.xz)
|
||||
|
||||
build() {
|
||||
cd $name-$version
|
||||
|
||||
patch -p1 -i $SRC/flac-realloc.patch
|
||||
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--mandir=/usr/man
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
X-Git-Url: http://git.xiph.org/?p=flac.git;a=blobdiff_plain;f=src%2Fmetaflac%2Futils.c;h=8a31daaddd47f8ea2d7b1e66445d180b4151e0db;hp=097537b2d39ea302269a16e7da9bc413e02ffb6e;hb=606fdfcaece19d3e05434bde57c289102a369069;hpb=d42c04260bf9e27cbb8c61a5529ecab3b20e25ff
|
||||
|
||||
diff --git a/src/metaflac/utils.c b/src/metaflac/utils.c
|
||||
index 097537b..8a31daa 100644
|
||||
--- a/src/metaflac/utils.c
|
||||
+++ b/src/metaflac/utils.c
|
||||
@@ -75,7 +75,7 @@ void local_strcat(char **dest, const char *source)
|
||||
*dest = safe_realloc_add_3op_(*dest, ndest, /*+*/nsource, /*+*/1);
|
||||
if(0 == *dest)
|
||||
die("out of memory growing string");
|
||||
- safe_strncpy((*dest)+ndest, source, ndest + nsource + 1);
|
||||
+ safe_strncpy((*dest)+ndest, source, nsource + 1);
|
||||
}
|
||||
|
||||
static inline int local_isprint(int c)
|
||||
@ -2,6 +2,7 @@ drwxr-xr-x root/root usr/
|
||||
drwxr-xr-x root/root usr/bin/
|
||||
-rwxr-xr-x root/root usr/bin/avcenc
|
||||
-rwxr-xr-x root/root usr/bin/h264encode
|
||||
-rwxr-xr-x root/root usr/bin/jpegenc
|
||||
-rwxr-xr-x root/root usr/bin/loadjpeg
|
||||
-rwxr-xr-x root/root usr/bin/mpeg2vaenc
|
||||
-rwxr-xr-x root/root usr/bin/mpeg2vldemo
|
||||
@ -16,15 +17,20 @@ drwxr-xr-x root/root usr/include/va/
|
||||
-rw-r--r-- root/root usr/include/va/va_backend_tpi.h
|
||||
-rw-r--r-- root/root usr/include/va/va_backend_vpp.h
|
||||
-rw-r--r-- root/root usr/include/va/va_compat.h
|
||||
-rw-r--r-- root/root usr/include/va/va_dec_hevc.h
|
||||
-rw-r--r-- root/root usr/include/va/va_dec_jpeg.h
|
||||
-rw-r--r-- root/root usr/include/va/va_dec_vp8.h
|
||||
-rw-r--r-- root/root usr/include/va/va_dec_vp9.h
|
||||
-rw-r--r-- root/root usr/include/va/va_dri2.h
|
||||
-rw-r--r-- root/root usr/include/va/va_dricommon.h
|
||||
-rw-r--r-- root/root usr/include/va/va_drm.h
|
||||
-rw-r--r-- root/root usr/include/va/va_drmcommon.h
|
||||
-rw-r--r-- root/root usr/include/va/va_egl.h
|
||||
-rw-r--r-- root/root usr/include/va/va_enc_h264.h
|
||||
-rw-r--r-- root/root usr/include/va/va_enc_hevc.h
|
||||
-rw-r--r-- root/root usr/include/va/va_enc_jpeg.h
|
||||
-rw-r--r-- root/root usr/include/va/va_enc_mpeg2.h
|
||||
-rw-r--r-- root/root usr/include/va/va_enc_vp8.h
|
||||
-rw-r--r-- root/root usr/include/va/va_glx.h
|
||||
-rw-r--r-- root/root usr/include/va/va_tpi.h
|
||||
-rw-r--r-- root/root usr/include/va/va_version.h
|
||||
@ -35,29 +41,29 @@ drwxr-xr-x root/root usr/lib/dri/
|
||||
-rwxr-xr-x root/root usr/lib/dri/dummy_drv_video.la
|
||||
-rwxr-xr-x root/root usr/lib/dri/dummy_drv_video.so
|
||||
-rwxr-xr-x root/root usr/lib/libva-drm.la
|
||||
lrwxrwxrwx root/root usr/lib/libva-drm.so -> libva-drm.so.1.3501.0
|
||||
lrwxrwxrwx root/root usr/lib/libva-drm.so.1 -> libva-drm.so.1.3501.0
|
||||
-rwxr-xr-x root/root usr/lib/libva-drm.so.1.3501.0
|
||||
lrwxrwxrwx root/root usr/lib/libva-drm.so -> libva-drm.so.1.3800.0
|
||||
lrwxrwxrwx root/root usr/lib/libva-drm.so.1 -> libva-drm.so.1.3800.0
|
||||
-rwxr-xr-x root/root usr/lib/libva-drm.so.1.3800.0
|
||||
-rwxr-xr-x root/root usr/lib/libva-egl.la
|
||||
lrwxrwxrwx root/root usr/lib/libva-egl.so -> libva-egl.so.1.3501.0
|
||||
lrwxrwxrwx root/root usr/lib/libva-egl.so.1 -> libva-egl.so.1.3501.0
|
||||
-rwxr-xr-x root/root usr/lib/libva-egl.so.1.3501.0
|
||||
lrwxrwxrwx root/root usr/lib/libva-egl.so -> libva-egl.so.1.3800.0
|
||||
lrwxrwxrwx root/root usr/lib/libva-egl.so.1 -> libva-egl.so.1.3800.0
|
||||
-rwxr-xr-x root/root usr/lib/libva-egl.so.1.3800.0
|
||||
-rwxr-xr-x root/root usr/lib/libva-glx.la
|
||||
lrwxrwxrwx root/root usr/lib/libva-glx.so -> libva-glx.so.1.3501.0
|
||||
lrwxrwxrwx root/root usr/lib/libva-glx.so.1 -> libva-glx.so.1.3501.0
|
||||
-rwxr-xr-x root/root usr/lib/libva-glx.so.1.3501.0
|
||||
lrwxrwxrwx root/root usr/lib/libva-glx.so -> libva-glx.so.1.3800.0
|
||||
lrwxrwxrwx root/root usr/lib/libva-glx.so.1 -> libva-glx.so.1.3800.0
|
||||
-rwxr-xr-x root/root usr/lib/libva-glx.so.1.3800.0
|
||||
-rwxr-xr-x root/root usr/lib/libva-tpi.la
|
||||
lrwxrwxrwx root/root usr/lib/libva-tpi.so -> libva-tpi.so.1.3501.0
|
||||
lrwxrwxrwx root/root usr/lib/libva-tpi.so.1 -> libva-tpi.so.1.3501.0
|
||||
-rwxr-xr-x root/root usr/lib/libva-tpi.so.1.3501.0
|
||||
lrwxrwxrwx root/root usr/lib/libva-tpi.so -> libva-tpi.so.1.3800.0
|
||||
lrwxrwxrwx root/root usr/lib/libva-tpi.so.1 -> libva-tpi.so.1.3800.0
|
||||
-rwxr-xr-x root/root usr/lib/libva-tpi.so.1.3800.0
|
||||
-rwxr-xr-x root/root usr/lib/libva-x11.la
|
||||
lrwxrwxrwx root/root usr/lib/libva-x11.so -> libva-x11.so.1.3501.0
|
||||
lrwxrwxrwx root/root usr/lib/libva-x11.so.1 -> libva-x11.so.1.3501.0
|
||||
-rwxr-xr-x root/root usr/lib/libva-x11.so.1.3501.0
|
||||
lrwxrwxrwx root/root usr/lib/libva-x11.so -> libva-x11.so.1.3800.0
|
||||
lrwxrwxrwx root/root usr/lib/libva-x11.so.1 -> libva-x11.so.1.3800.0
|
||||
-rwxr-xr-x root/root usr/lib/libva-x11.so.1.3800.0
|
||||
-rwxr-xr-x root/root usr/lib/libva.la
|
||||
lrwxrwxrwx root/root usr/lib/libva.so -> libva.so.1.3501.0
|
||||
lrwxrwxrwx root/root usr/lib/libva.so.1 -> libva.so.1.3501.0
|
||||
-rwxr-xr-x root/root usr/lib/libva.so.1.3501.0
|
||||
lrwxrwxrwx root/root usr/lib/libva.so -> libva.so.1.3800.0
|
||||
lrwxrwxrwx root/root usr/lib/libva.so.1 -> libva.so.1.3800.0
|
||||
-rwxr-xr-x root/root usr/lib/libva.so.1.3800.0
|
||||
drwxr-xr-x root/root usr/lib/pkgconfig/
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/libva-drm.pc
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/libva-egl.pc
|
||||
|
||||
@ -1,2 +1 @@
|
||||
e564ae7c20962c821ac2b5cb1693e1a2 0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch
|
||||
eb4db967f068854444b597071c66b480 libva-1.3.1.tar.bz2
|
||||
7a5eb1fdf531f987211b7228a6a46428 libva-1.6.1.tar.bz2
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
From d4988142a3f2256e38c5c5cdcdfc1b4f5f3c1ea9 Mon Sep 17 00:00:00 2001
|
||||
From: "Xiang, Haihao" <haihao.xiang@intel.com>
|
||||
Date: Thu, 18 Jul 2013 13:13:31 +0800
|
||||
Subject: [PATCH] va: release VADisplayContext at the end of vaTerminate()
|
||||
|
||||
Otherwise it will result in invalid reading in va_TraceEnd()
|
||||
|
||||
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
|
||||
---
|
||||
va/va.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/va/va.c b/va/va.c
|
||||
index 6cb17ef..0ba595b 100644
|
||||
--- a/va/va.c
|
||||
+++ b/va/va.c
|
||||
@@ -515,15 +515,15 @@ VAStatus vaTerminate (
|
||||
free(old_ctx->vtable_vpp);
|
||||
old_ctx->vtable_vpp = NULL;
|
||||
|
||||
- if (VA_STATUS_SUCCESS == vaStatus)
|
||||
- pDisplayContext->vaDestroy(pDisplayContext);
|
||||
-
|
||||
VA_TRACE_LOG(va_TraceTerminate, dpy);
|
||||
|
||||
va_TraceEnd(dpy);
|
||||
|
||||
va_FoolEnd(dpy);
|
||||
|
||||
+ if (VA_STATUS_SUCCESS == vaStatus)
|
||||
+ pDisplayContext->vaDestroy(pDisplayContext);
|
||||
+
|
||||
return vaStatus;
|
||||
}
|
||||
|
||||
--
|
||||
2.0.0
|
||||
|
||||
@ -5,19 +5,13 @@
|
||||
# Depends on: mesa3d
|
||||
|
||||
name=libva
|
||||
version=1.3.1
|
||||
release=2
|
||||
source=(http://www.freedesktop.org/software/vaapi/releases/$name/$name-$version.tar.bz2
|
||||
0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch)
|
||||
version=1.6.1
|
||||
release=1
|
||||
source=(http://www.freedesktop.org/software/vaapi/releases/$name/$name-$version.tar.bz2)
|
||||
|
||||
build() {
|
||||
cd $name-$version
|
||||
|
||||
patch -p1 -i $SRC/0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch
|
||||
|
||||
# --disable-wayland
|
||||
sed -i -e '17547,17643d' configure
|
||||
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--disable-wayland \
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user