Skip to content

V
vlc-1.1
Commit 19e6278e authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

* Fix Makefiles for removed .rle fonts

parent cf3bb5c0
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 10 deletions
Makefile.am
View file @ 19e6278e
...@@ -404,7 +404,6 @@ VLC.app: vlc ...@@ -404,7 +404,6 @@ VLC.app: vlc
"$(srcdir)/VLC.app/Contents/MacOS/modules" ; \ "$(srcdir)/VLC.app/Contents/MacOS/modules" ; \
fi ; done fi ; done
$(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/share $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/share
$(INSTALL) -m 644 $(srcdir)/share/*.rle $(srcdir)/VLC.app/Contents/MacOS/share
$(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/share/http $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/share/http
$(INSTALL) -m 644 $(srcdir)/share/http/*.html $(srcdir)/VLC.app/Contents/MacOS/share/http $(INSTALL) -m 644 $(srcdir)/share/http/*.html $(srcdir)/VLC.app/Contents/MacOS/share/http
$(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/share/http/admin $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/share/http/admin
...@@ -528,7 +527,6 @@ package-beos: ...@@ -528,7 +527,6 @@ package-beos:
cp $(srcdir)/po/$${i}.gmo $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ cp $(srcdir)/po/$${i}.gmo $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
done done
mkdir -p $(srcdir)/tmp/vlc/share mkdir -p $(srcdir)/tmp/vlc/share
cp $(srcdir)/share/*.rle $(srcdir)/tmp/vlc/share/
# Create package with debug symbols # Create package with debug symbols
mimeset -f $(srcdir)/tmp/vlc/* $(srcdir)/tmp/vlc/*/* mimeset -f $(srcdir)/tmp/vlc/* $(srcdir)/tmp/vlc/*/*
......
modules/codec/subsdec/subsdec.c
View file @ 19e6278e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* subsdec.c : SPU decoder thread * subsdec.c : SPU decoder thread
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * Copyright (C) 2000-2001 VideoLAN
* $Id: subsdec.c,v 1.1 2003/07/22 20:49:10 hartman Exp $ * $Id: subsdec.c,v 1.2 2003/07/22 22:02:44 hartman Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* Samuel Hocevar <sam@zoy.org> * Samuel Hocevar <sam@zoy.org>
...@@ -72,6 +72,7 @@ vlc_module_begin(); ...@@ -72,6 +72,7 @@ vlc_module_begin();
set_description( _("file subtitles decoder") ); set_description( _("file subtitles decoder") );
set_capability( "decoder", 50 ); set_capability( "decoder", 50 );
set_callbacks( OpenDecoder, NULL ); set_callbacks( OpenDecoder, NULL );
add_category_hint( N_("Subtitles"), NULL, VLC_FALSE );
#if defined(HAVE_ICONV) #if defined(HAVE_ICONV)
add_string_from_list( "subsdec-encoding", "ISO-8859-1", ppsz_encodings, NULL, add_string_from_list( "subsdec-encoding", "ISO-8859-1", ppsz_encodings, NULL,
...@@ -105,7 +106,6 @@ static int OpenDecoder( vlc_object_t *p_this ) ...@@ -105,7 +106,6 @@ static int OpenDecoder( vlc_object_t *p_this )
static int RunDecoder( decoder_fifo_t * p_fifo ) static int RunDecoder( decoder_fifo_t * p_fifo )
{ {
subsdec_thread_t * p_subsdec; subsdec_thread_t * p_subsdec;
vout_thread_t * p_vout_backup = NULL;
/* Allocate the memory needed to store the thread's structure */ /* Allocate the memory needed to store the thread's structure */
p_subsdec = (subsdec_thread_t *)malloc( sizeof(subsdec_thread_t) ); p_subsdec = (subsdec_thread_t *)malloc( sizeof(subsdec_thread_t) );
......
share/Makefile.am
View file @ 19e6278e
...@@ -5,8 +5,6 @@ EXTRA_DIST = $(DIST_rsrc) $(DIST_fonts) ...@@ -5,8 +5,6 @@ EXTRA_DIST = $(DIST_rsrc) $(DIST_fonts)
pkgdatadir = $(datadir)/vlc pkgdatadir = $(datadir)/vlc
dist_pkgdata_DATA = \ dist_pkgdata_DATA = \
font-eutopiabold21.rle \
font-eutopiabold36.rle \
$(DIST_familiar) \ $(DIST_familiar) \
$(DIST_icons16) \ $(DIST_icons16) \
$(DIST_icons32) \ $(DIST_icons32) \
...@@ -17,10 +15,6 @@ nobase_dist_pkgdata_DATA = \ ...@@ -17,10 +15,6 @@ nobase_dist_pkgdata_DATA = \
$(DIST_skins) $(DIST_skins)
DIST_fonts = \ DIST_fonts = \
default8x16.psf \
default8x9.psf \
font-eutopiabold21.rle \
font-eutopiabold36.rle \
$(NULL) $(NULL)
DIST_rsrc = \ DIST_rsrc = \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment