rpm/libbluray
SHA256
1
0
Fork 0
forked from pool/libbluray
Code Pull Requests Activity

Accepting request 210594 from openSUSE:Factory:Staging:freetype2

Browse Source 
Added use-recommended-freetype-include.patch -- needed for freetype2 2.5.1

OBS-URL: https://build.opensuse.org/request/show/210594
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libbluray?expand=0&rev=18
This commit is contained in:
Sascha Peilicke 2013-12-12 09:40:59 +00:00 committed by Git OBS Bridge
parent 80b56fa66c
commit 7a3fa90d63
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libbluray.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Dec 11 18:29:00 UTC 2013 - hrvoje.senjan@gmail.com
- Added use-recommended-freetype-include.patch -- Freetype upstream
recommends using their macros together with ft2build include.
Positive sideeffect is that this patch makes it build with both
freetype2 2.5.1, and older version
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 4 19:46:37 UTC 2013 - zaitor@opensuse.org Fri Oct 4 19:46:37 UTC 2013 - zaitor@opensuse.org

4
libbluray.spec
View File

@ -25,6 +25,9 @@ License: LGPL-2.1+
Group: Productivity/Multimedia/Other Group: Productivity/Multimedia/Other
Url: http://bd.videolan.org Url: http://bd.videolan.org
Source: ftp://ftp.videolan.org/pub/videolan/%{name}/%{version}/%{name}-%{version}.tar.bz2 Source: ftp://ftp.videolan.org/pub/videolan/%{name}/%{version}/%{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM use-recommended-freetype-include.patch -- Freetype upstream recommends using their macros together with
# ft2build include. Positive sideeffect is that this patch makes it build with both freetype2 2.5.1, and older versions
Patch0: use-recommended-freetype-include.patch
Source99: baselibs.conf Source99: baselibs.conf
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(freetype2)
@ -66,6 +69,7 @@ MPlayer). We, the authors of this library, do not condone nor endorse piracy.
%prep %prep
%setup -q %setup -q
%patch0 -p1
%build %build
%configure --disable-static %configure --disable-static

13
use-recommended-freetype-include.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/libbluray/decoders/textst_render.c b/src/libbluray/decoders/textst_render.c
index 780b640..ffcb1bd 100644
--- a/src/libbluray/decoders/textst_render.c
+++ b/src/libbluray/decoders/textst_render.c
@@ -30,7 +30,7 @@
#ifdef HAVE_FT2
#include <ft2build.h>
#include FT_FREETYPE_H
-#include <freetype/ftsynth.h>
+#include FT_SYNTHESIS_H
#endif
#include "textst_render.h"