commit: eadbf0139480b40d25fe6910027b282e8243f08d
parent 43abf37dfeba40f7b95c65be6bf261f7e447f641
Author: Michael Forney <mforney@mforney.org>
Date: Tue, 31 Oct 2017 20:22:09 -0700
libass: Update to 0.14.0
Diffstat:
5 files changed, 41 insertions(+), 100 deletions(-)
diff --git a/pkg/libass/README.md b/pkg/libass/README.md
@@ -0,0 +1,11 @@
+# libass
+
+## config.h
+Generated with
+
+ ./configure \
+ --disable-require-system-font-provider \
+ FREETYPE_CFLAGS=-I/src/oasis/pkg/freetype/src/include \
+ FREETYPE_LIBS=/src/oasis/out/pkg/freetype/libfreetype.a \
+ FRIBIDI_CFLAGS=-I/src/oasis/out/pkg/fribidi/include \
+ FRIBIDI_LIBS=/home/michael/src/oasis/out/pkg/fribidi/libfribidi.a
diff --git a/pkg/libass/config.h b/pkg/libass/config.h
@@ -1,5 +1,3 @@
-#include <config-posix.h>
-
#define CONFIG_ASM 1
/* #undef CONFIG_CORETEXT */
/* #undef CONFIG_DIRECTWRITE */
@@ -10,16 +8,29 @@
#define CONFIG_ICONV 1
/* #undef CONFIG_LARGE_TILES */
/* #undef CONFIG_LIBPNG */
-#define CONFIG_RASTERIZER 1
+#define HAVE_DLFCN_H 1
+#define HAVE_ICONV_H 1
+#define HAVE_INTTYPES_H 1
#define HAVE_LIBM 1
#define HAVE_MEMORY_H 1
+#define HAVE_STDBOOL_H 1
+#define HAVE_STDINT_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STRDUP 1
+#define HAVE_STRINGS_H 1
+#define HAVE_STRING_H 1
+#define HAVE_STRNDUP 1
+#define HAVE_SYS_STAT_H 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_UNISTD_H 1
#define HAVE__BOOL 1
#define LT_OBJDIR ".libs/"
#define PACKAGE "libass"
#define PACKAGE_BUGREPORT ""
#define PACKAGE_NAME "libass"
-#define PACKAGE_STRING "libass 0.13.7"
+#define PACKAGE_STRING "libass 0.14.0"
#define PACKAGE_TARNAME "libass"
#define PACKAGE_URL ""
-#define PACKAGE_VERSION "0.13.7"
-#define VERSION "0.13.7"
+#define PACKAGE_VERSION "0.14.0"
+#define STDC_HEADERS 1
+#define VERSION "0.14.0"
diff --git a/pkg/libass/gen.lua b/pkg/libass/gen.lua
@@ -1,15 +1,15 @@
cflags{
- '-I include',
'-I $dir',
'-I pkg/freetype/src/include',
'-I $builddir/pkg/fribidi/include',
}
set('nasmflags', {
- '-w -orphan-labels',
'-D ARCH_X86_64=1',
'-D HAVE_ALIGNED_STACK=1',
- '-i $srcdir/libass/x86/',
+ '-D HAVE_CPUNOP=0',
+ '-D private_prefix=ass',
+ '-i $srcdir/libass/',
'-f elf64',
})
@@ -21,17 +21,18 @@ pkg.deps = {
lib('libass.a', [[
libass/(
- ass.c ass_cache.c ass_font.c ass_fontselect.c ass_render.c
- ass_utils.c ass_bitmap.c ass_blur.c ass_library.c
- ass_drawing.c
- ass_parse.c ass_render_api.c ass_shaper.c
- ass_strtod.c ass_fontconfig.c
- ass_string.c
+ ass.c ass_utils.c
+ ass_string.c ass_strtod.c
+ ass_library.c ass_cache.c
+ ass_font.c ass_fontselect.c
+ ass_render.c ass_render_api.c
+ ass_parse.c ass_shaper.c
+ ass_outline.c ass_drawing.c
ass_rasterizer.c ass_rasterizer_c.c
+ ass_bitmap.c ass_blur.c
x86/(
- blend_bitmaps.asm blur.asm cpuid.asm utils.asm
+ rasterizer.asm blend_bitmaps.asm blur.asm cpuid.asm
be_blur.asm
- rasterizer.asm
)
)
$builddir/pkg/(
diff --git a/pkg/libass/patch/0001-Fix-ASM-build-with-nasm.patch b/pkg/libass/patch/0001-Fix-ASM-build-with-nasm.patch
@@ -1,82 +0,0 @@
-From 311524f544cc648293ba20c99219f82bea3b3a35 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sun, 9 Jul 2017 12:55:56 -0700
-Subject: [PATCH] Fix ASM build with nasm
-
----
- libass/x86/be_blur.asm | 6 +++---
- libass/x86/blend_bitmaps.asm | 4 ++--
- libass/x86/x86inc.asm | 4 ----
- 3 files changed, 5 insertions(+), 9 deletions(-)
-
-diff --git a/libass/x86/be_blur.asm b/libass/x86/be_blur.asm
-index 007d60d..3b09176 100644
---- a/libass/x86/be_blur.asm
-+++ b/libass/x86/be_blur.asm
-@@ -82,8 +82,8 @@ cglobal be_blur, 5,15,9
- movzx r10, byte [r7] ; temp1 = src[0];
- movzx r11, byte [r7 + 1] ; temp2 = src[1];
- add r10, r11; temp1 += temp2
-- movd xmm0, r10; __m128i old_pix_128 = temp2;
-- movd xmm1, r11; __m128i old_sum_128 = temp1;
-+ movq xmm0, r10; __m128i old_pix_128 = temp2;
-+ movq xmm1, r11; __m128i old_sum_128 = temp1;
- .width_loop
- movq xmm2, [r7 + r6]; __m128i new_pix = (src+x);
- punpcklbw xmm2, xmm6 ; new_pix = _mm_unpacklo_epi8(new_pix, temp3);
-@@ -152,7 +152,7 @@ cglobal be_blur, 5,15,9
- lea r12, [r4 + r3 * 2] ; unsigned char *col_sum_buf = tmp + stride * 2;
- lea r14, [r1 - 2] ; tmpreg = (w-2);
- and r14, -16 ; tmpreg &= (~15);
-- vmovdqa ymm7, [low_word_zero wrt rip]
-+ vmovdqa ymm7, [rel low_word_zero]
- .first_loop
- movzx r10, byte [r7 + r6] ; int temp1 = src[x];
- lea r11, [r8 + r10] ; int temp2 = old_pix + temp1;
-diff --git a/libass/x86/blend_bitmaps.asm b/libass/x86/blend_bitmaps.asm
-index 3a9b2dd..5843133 100644
---- a/libass/x86/blend_bitmaps.asm
-+++ b/libass/x86/blend_bitmaps.asm
-@@ -215,7 +215,7 @@ cglobal mul_bitmaps, 8,12
- imul r7, r3
- add r7, r2 ; last address
- pxor xmm2, xmm2
-- movdqa xmm3, [words_255 wrt rip]
-+ movdqa xmm3, [rel words_255]
- mov r9, r6
- and r9, -8 ; &= (~8);
- .height_loop:
-@@ -262,7 +262,7 @@ cglobal mul_bitmaps, 8,12
- imul r7, r3
- add r7, r2 ; last address
- vpxor ymm2, ymm2
-- vmovdqa ymm3, [words_255 wrt rip]
-+ vmovdqa ymm3, [rel words_255]
- mov r9, r6
- and r9, -16 ; &= (~16);
- .height_loop:
-diff --git a/libass/x86/x86inc.asm b/libass/x86/x86inc.asm
-index 53e104d..a8c7408 100644
---- a/libass/x86/x86inc.asm
-+++ b/libass/x86/x86inc.asm
-@@ -82,9 +82,6 @@
- default rel
- %endif
-
--; Always use long nops (reduces 0x90 spam in disassembly on x86_32)
--CPU amdnop
--
- ; Macros to eliminate most code duplication between x86_32 and x86_64:
- ; Currently this works only for leaf functions which load all their arguments
- ; into registers at the start, and make no other use of the stack. Luckily that
-@@ -745,7 +742,6 @@ SECTION .note.GNU-stack noalloc noexec nowrite progbits
- ; All subsequent functions (up to the next INIT_CPUFLAGS) is built for the specified cpu.
- ; You shouldn't need to invoke this macro directly, it's a subroutine for INIT_MMX &co.
- %macro INIT_CPUFLAGS 0-2
-- CPU amdnop
- %if %0 >= 1
- %xdefine cpuname %1
- %assign cpuflags cpuflags_%1
---
-2.13.2
-
diff --git a/pkg/libass/rev b/pkg/libass/rev
@@ -1 +1 @@
-7
+8
