diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2009-09-24 20:30:33 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2009-09-24 20:30:33 +0000 |
| commit | 7903beaa1cff4b0c9cc8777f6bae1373bb4425ee (patch) | |
| tree | 21888786f4ab8eb418b0ff67f64aba728215f06a /src/patchsets/vlc | |
| parent | Added real_rootflags info to the handbook. bug 273803. thanks to mpagano for ... (diff) | |
| download | gentoo-7903beaa1cff4b0c9cc8777f6bae1373bb4425ee.tar.gz gentoo-7903beaa1cff4b0c9cc8777f6bae1373bb4425ee.tar.bz2 gentoo-7903beaa1cff4b0c9cc8777f6bae1373bb4425ee.zip | |
Fix build at -O0 without fontconfig, bug #281963
Diffstat (limited to 'src/patchsets/vlc')
| -rw-r--r-- | src/patchsets/vlc/1.0.2/550_all_nofc.patch | 51 | ||||
| -rw-r--r-- | src/patchsets/vlc/1.0.2/series | 1 |
2 files changed, 52 insertions, 0 deletions
diff --git a/src/patchsets/vlc/1.0.2/550_all_nofc.patch b/src/patchsets/vlc/1.0.2/550_all_nofc.patch new file mode 100644 index 0000000000..8b3570aa3e --- /dev/null +++ b/src/patchsets/vlc/1.0.2/550_all_nofc.patch @@ -0,0 +1,51 @@ +commit 184f04c939a361c9c9f2eb549fcc2e3d1dac2227 +Author: Alexis Ballier <aballier@gentoo.org> +Date: Thu Sep 24 21:58:36 2009 +0200 + + Fix build without fontconfig nor optimizations. + + Configuring vlc with --disable-fontconfig and --disable-optimizations makes it fail to build the freetype plugin. + At higher optimizations levels, gcc performs dead code elimitation which does not happen at -O0, then the linker is looking for functions that are defined only when fontconfig is enabled. + + References: https://bugs.gentoo.org/show_bug.cgi?id=281963 + + Signed-off-by: Rémi Denis-Courmont <remi@remlab.net> + +Index: vlc-1.0.2/modules/misc/freetype.c +=================================================================== +--- vlc-1.0.2.orig/modules/misc/freetype.c ++++ vlc-1.0.2/modules/misc/freetype.c +@@ -2416,6 +2416,33 @@ static char* FontConfig_Select( FcConfig + FcPatternDestroy( p_pat ); + return strdup( (const char*)val_s ); + } ++#else ++ ++static void SetupLine( filter_t *p_filter, const char *psz_text_in, ++ uint32_t **psz_text_out, uint32_t *pi_runs, ++ uint32_t **ppi_run_lengths, ft_style_t ***ppp_styles, ++ ft_style_t *p_style ) ++{ ++ VLC_UNUSED(p_filter); ++ VLC_UNUSED(psz_text_in); ++ VLC_UNUSED(psz_text_out); ++ VLC_UNUSED(pi_runs); ++ VLC_UNUSED(ppi_run_lengths); ++ VLC_UNUSED(ppp_styles); ++ VLC_UNUSED(p_style); ++} ++ ++static ft_style_t *GetStyleFromFontStack( filter_sys_t *p_sys, ++ font_stack_t **p_fonts, bool b_bold, bool b_italic, ++ bool b_uline ) ++{ ++ VLC_UNUSED(p_sys); ++ VLC_UNUSED(p_fonts); ++ VLC_UNUSED(b_bold); ++ VLC_UNUSED(b_italic); ++ VLC_UNUSED(b_uline); ++ return NULL; ++} + #endif + + static void FreeLine( line_desc_t *p_line ) diff --git a/src/patchsets/vlc/1.0.2/series b/src/patchsets/vlc/1.0.2/series index 83381198ca..e3825b47d5 100644 --- a/src/patchsets/vlc/1.0.2/series +++ b/src/patchsets/vlc/1.0.2/series @@ -6,3 +6,4 @@ 320_all_disable_media_list_player_tests.patch 530_all_older_xcb_xv.patch 540_all_x264.patch +550_all_nofc.patch |