vlc | branch: master | Sean McGovern <[email protected]> | Thu Jul 2 19:02:17 2015 -0400| [9ffab1842c77ffd8d524a975b0c4717c9e2ad453] | committer: Jean-Baptiste Kempf
contrib/ass: use correct ASFLAGS for yasm on Solaris Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9ffab1842c77ffd8d524a975b0c4717c9e2ad453 --- contrib/src/ass/ass-solaris.patch | 11 +++++++++++ contrib/src/ass/rules.mak | 2 ++ 2 files changed, 13 insertions(+) diff --git a/contrib/src/ass/ass-solaris.patch b/contrib/src/ass/ass-solaris.patch new file mode 100644 index 0000000..4e01b84 --- /dev/null +++ b/contrib/src/ass/ass-solaris.patch @@ -0,0 +1,11 @@ +--- libass/configure.ac.ORIG Wed Jan 7 14:00:15 2015 ++++ libass/configure.ac Thu Jul 2 18:57:07 2015 +@@ -70,7 +70,7 @@ + AS_CASE([$host], + [*darwin*], [ + ASFLAGS="$ASFLAGS -f macho$BITS -DPREFIX -DHAVE_ALIGNED_STACK=1" ], +- [*linux*|*dragonfly*|*bsd*], [ ++ [*linux*|*dragonfly*|*bsd*|*solaris*], [ + ASFLAGS="$ASFLAGS -f elf -DHAVE_ALIGNED_STACK=1" ], + [*cygwin*|*mingw*], [ + ASFLAGS="$ASFLAGS -f win$BITS" diff --git a/contrib/src/ass/rules.mak b/contrib/src/ass/rules.mak index eca8e1d..18280aa 100644 --- a/contrib/src/ass/rules.mak +++ b/contrib/src/ass/rules.mak @@ -33,6 +33,7 @@ $(TARBALLS)/libass-$(ASS_VERSION).tar.gz: libass: libass-$(ASS_VERSION).tar.gz .sum-ass $(UNPACK) $(APPLY) $(SRC)/ass/ass-macosx.patch + $(APPLY) $(SRC)/ass/ass-solaris.patch $(UPDATE_AUTOCONFIG) $(MOVE) @@ -53,6 +54,7 @@ ASS_CONF += --disable-harfbuzz endif .ass: libass + $(RECONF) cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -O3" ./configure $(HOSTCONF) $(ASS_CONF) cd $< && $(MAKE) install touch $@ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
