Skip to content

V
vlc
Commit 29670af1 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options 

  * Changed debian/control to fix Debian bug #83707
  * Added a --disable-css configure option
  * Moved some code here and there in the DVD plugin to make it easier
    for me to build the Debian CSS-free packages.
parent 4ebb78dd
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1362 additions and 1260 deletions
Makefile.in
View file @ 29670af1
...@@ -487,7 +487,7 @@ show: ...@@ -487,7 +487,7 @@ show:
# ugliest of all, but I have no time to do it -- sam # ugliest of all, but I have no time to do it -- sam
snapshot: snapshot:
rm -rf /tmp/vlc-@VLC_VERSION@ /tmp/vlc-@VLC_VERSION@nocss rm -rf /tmp/vlc-@VLC_VERSION@* /tmp/vlc-@VLC_VERSION@nocss*
# copy archive in /tmp # copy archive in /tmp
find -type d | while read i ; \ find -type d | while read i ; \
do mkdir -p /tmp/vlc-@VLC_VERSION@/$$i ; \ do mkdir -p /tmp/vlc-@VLC_VERSION@/$$i ; \
...@@ -507,7 +507,7 @@ snapshot: ...@@ -507,7 +507,7 @@ snapshot:
Makefile.in Makefile.dep configure configure.in install-sh \ Makefile.in Makefile.dep configure configure.in install-sh \
config.sub config.guess todo.pl \ config.sub config.guess todo.pl \
/tmp/vlc-@VLC_VERSION@/ /tmp/vlc-@VLC_VERSION@/
for file in control vlc-gnome.menu vlc.copyright vlc.docs changelog \ for file in control vlc-gtk.menu vlc.copyright vlc.docs changelog \
rules vlc.1 vlc.dirs vlc.menu ; do \ rules vlc.1 vlc.dirs vlc.menu ; do \
cp debian/$$file /tmp/vlc-@VLC_VERSION@/debian/ ; done cp debian/$$file /tmp/vlc-@VLC_VERSION@/debian/ ; done
for file in default8x16.psf default8x9.psf gvlc.png vlc.png ; do \ for file in default8x16.psf default8x9.psf gvlc.png vlc.png ; do \
...@@ -521,28 +521,28 @@ snapshot: ...@@ -521,28 +521,28 @@ snapshot:
mv /tmp/vlc-@VLC_VERSION@.tar.gz /tmp/vlc-@VLC_VERSION@.tar.bz2 .. mv /tmp/vlc-@VLC_VERSION@.tar.gz /tmp/vlc-@VLC_VERSION@.tar.bz2 ..
# removing CSS stuff # removing CSS stuff
# find /tmp/vlc-@VLC_VERSION@ -type f -name '*css*' | xargs rm -f for x in plugins/dvd/dvd.c plugins/dvd/dvd_css.c ; do \
# for x in Makefile.in src/input/input_dvd.c src/input/input_dvd.h ; do \ rm -f /tmp/vlc-@VLC_VERSION@/$$x ; \
# rm -f /tmp/vlc-@VLC_VERSION@/$$x ; \ perl -ne 'if (/^#e(lse|ndif).*HAVE_CSS/) { $$i=0; } \
# perl -ne 'if (/^#e(lse|ndif)/) { $$i=0; } \ if (/^#if.*HAVE_CSS/) { $$i=1; } \
# if (/^#if.*DVD/) { $$i=1; print "#if 0\n"; } \ elsif (!$$i && !/^#.*HAVE_CSS/) { print $$_; }' \
# elsif (!$$i || /^#/) { print $$_; }' \ < $$x >| /tmp/vlc-@VLC_VERSION@/$$x ; \
# < $$x | grep -vi css >| /tmp/vlc-@VLC_VERSION@/$$x ; \ done
# done rm -f /tmp/vlc-@VLC_VERSION@/plugins/dvd/dvd_csstables.c
# rm -f /tmp/vlc-@VLC_VERSION@/debian/changelog rm -f /tmp/vlc-@VLC_VERSION@/debian/changelog
# sed 's/\(^vlc ([^-]*\)-/\1nocss-/' < debian/changelog \ sed 's/\(^vlc ([^-]*\)-/\1nocss-/' < debian/changelog \
# > /tmp/vlc-@VLC_VERSION@/debian/changelog > /tmp/vlc-@VLC_VERSION@/debian/changelog
#
# # build nocss archives # build nocss archives
# (cd /tmp ; mv vlc-@VLC_VERSION@ vlc-@VLC_VERSION@nocss ; \ (cd /tmp ; mv vlc-@VLC_VERSION@ vlc-@VLC_VERSION@nocss ; \
# tar cf vlc-@VLC_VERSION@nocss.tar vlc-@VLC_VERSION@nocss ; \ tar cf vlc-@VLC_VERSION@nocss.tar vlc-@VLC_VERSION@nocss ; \
# bzip2 -f -9 < vlc-@VLC_VERSION@nocss.tar \ bzip2 -f -9 < vlc-@VLC_VERSION@nocss.tar \
# > vlc-@VLC_VERSION@nocss.tar.bz2 ; \ > vlc-@VLC_VERSION@nocss.tar.bz2 ; \
# gzip -f -9 vlc-@VLC_VERSION@nocss.tar ) gzip -f -9 vlc-@VLC_VERSION@nocss.tar )
# mv /tmp/vlc-@VLC_VERSION@nocss.tar.gz \ mv /tmp/vlc-@VLC_VERSION@nocss.tar.gz \
# /tmp/vlc-@VLC_VERSION@nocss.tar.bz2 .. /tmp/vlc-@VLC_VERSION@nocss.tar.bz2 ..
#
# # clean up # clean up
rm -rf /tmp/vlc-@VLC_VERSION@* rm -rf /tmp/vlc-@VLC_VERSION@*
plugins: $(PLUGINS:%=lib/%.so) plugins: $(PLUGINS:%=lib/%.so)
......
configure
View file @ 29670af1
This diff is collapsed.
configure.in
View file @ 29670af1
...@@ -123,6 +123,10 @@ AC_ARG_ENABLE(mmx, ...@@ -123,6 +123,10 @@ AC_ARG_ENABLE(mmx,
[ --disable-mmx Disable MMX optimizations (default enabled for x86)], [ --disable-mmx Disable MMX optimizations (default enabled for x86)],
[ if test x$enableval = xyes; then ARCH=${ARCH}" mmx"; PLUGINS=${PLUGINS}${ACCEL_PLUGINS}; fi ], [ if test x$enableval = xyes; then ARCH=${ARCH}" mmx"; PLUGINS=${PLUGINS}${ACCEL_PLUGINS}; fi ],
[ if test x${host_cpu} = xi686 -o x${host_cpu} = xi586; then ARCH=${ARCH}" mmx"; PLUGINS=${PLUGINS}${ACCEL_PLUGINS}; fi ]) [ if test x${host_cpu} = xi686 -o x${host_cpu} = xi586; then ARCH=${ARCH}" mmx"; PLUGINS=${PLUGINS}${ACCEL_PLUGINS}; fi ])
AC_ARG_ENABLE(css,
[ --disable-css Disable DVD CSS decryption (default enabled)],
[ if test x$enableval = xyes; then CSS=1; else CSS=0; fi ], [ CSS=1; ])
if test x${CSS} = x1; then AC_DEFINE(HAVE_CSS, 1, Define if you want DVD CSS decryption.) fi
AC_ARG_ENABLE(debug, AC_ARG_ENABLE(debug,
[ --enable-debug Enable debug mode (default disabled)], [ --enable-debug Enable debug mode (default disabled)],
[ if test x$enableval = xyes; then DEBUG=1; fi ]) [ if test x$enableval = xyes; then DEBUG=1; fi ])
...@@ -225,6 +229,7 @@ AC_SUBST(ALIASES) ...@@ -225,6 +229,7 @@ AC_SUBST(ALIASES)
AC_SUBST(DEBUG) AC_SUBST(DEBUG)
AC_SUBST(STATS) AC_SUBST(STATS)
AC_SUBST(OPTIMS) AC_SUBST(OPTIMS)
AC_SUBST(CSS)
AC_SUBST(DYNAMIC_FLAG) AC_SUBST(DYNAMIC_FLAG)
AC_SUBST(LIB_SDL) AC_SUBST(LIB_SDL)
AC_SUBST(LIB_GLIDE) AC_SUBST(LIB_GLIDE)
...@@ -241,6 +246,7 @@ architecture : ${ARCH} ...@@ -241,6 +246,7 @@ architecture : ${ARCH}
debug mode : ${DEBUG} debug mode : ${DEBUG}
statistics : ${STATS} statistics : ${STATS}
optimizations : ${OPTIMS} optimizations : ${OPTIMS}
CSS decryption : ${CSS}
plugins : ${PLUGINS} plugins : ${PLUGINS}
vlc aliases : ${ALIASES} vlc aliases : ${ALIASES}
" "
......
debian/control
View file @ 29670af1
...@@ -2,7 +2,7 @@ Source: vlc ...@@ -2,7 +2,7 @@ Source: vlc
Section: graphics Section: graphics
Priority: optional Priority: optional
Maintainer: Samuel Hocevar <sam@zoy.org> Maintainer: Samuel Hocevar <sam@zoy.org>
Build-Depends: debhelper (>=2.2.0), xlib6g-dev, libgnome-dev, libggi2-dev, libglide-dev, libesd0-dev, libsdl1.1-dev, alsa-headers Build-Depends: debhelper (>=2.2.0), xlib6g-dev, libgnome-dev, libggi2-dev, libglide-dev [i386], libesd0-dev, libsdl1.1-dev, alsa-headers
Standards-Version: 3.0.1 Standards-Version: 3.0.1
Package: vlc Package: vlc
......
include/defs.h.in
View file @ 29670af1
...@@ -163,3 +163,6 @@ ...@@ -163,3 +163,6 @@
/* DVD support for linux */ /* DVD support for linux */
#undef LINUX_DVD #undef LINUX_DVD
/* Define if you want DVD CSS decryption. */
#undef HAVE_CSS
plugins/dvd/dvd.c
View file @ 29670af1
...@@ -62,7 +62,11 @@ void _M( input_getfunctions )( function_list_t * p_function_list ); ...@@ -62,7 +62,11 @@ void _M( input_getfunctions )( function_list_t * p_function_list );
MODULE_INIT MODULE_INIT
{ {
p_module->psz_name = MODULE_STRING; p_module->psz_name = MODULE_STRING;
p_module->psz_longname = "DVD input module"; #ifdef HAVE_CSS
p_module->psz_longname = "full DVD input module with CSS decryption";
#else
p_module->psz_longname = "DVD input module, CSS decryption disabled";
#endif
p_module->psz_version = VERSION; p_module->psz_version = VERSION;
p_module->i_capabilities = MODULE_CAPABILITY_NULL p_module->i_capabilities = MODULE_CAPABILITY_NULL
......
plugins/dvd/dvd_css.c
View file @ 29670af1
This diff is collapsed.
plugins/dvd/dvd_csstables.h 0 → 100644
View file @ 29670af1
This diff is collapsed.
plugins/dvd/input_dvd.c
View file @ 29670af1
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* -dvd_udf to find files * -dvd_udf to find files
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2001 VideoLAN * Copyright (C) 1998-2001 VideoLAN
* $Id: input_dvd.c,v 1.22 2001/03/02 03:32:46 stef Exp $ * $Id: input_dvd.c,v 1.23 2001/03/02 13:47:01 sam Exp $
* *
* Author: Stphane Borel <stef@via.ecp.fr> * Author: Stphane Borel <stef@via.ecp.fr>
* *
...@@ -83,157 +83,158 @@ static struct ...@@ -83,157 +83,158 @@ static struct
{ {
char p_code[3]; char p_code[3];
char p_lang_long[20]; char p_lang_long[20];
} lang_tbl[] = }
{
lang_tbl[] =
{
/* The ISO 639 language codes. /* The ISO 639 language codes.
* Language names with * prefix are not spelled in their own language * Language names with * prefix are not spelled in their own language
*/ */
{" ", "Not Specified"}, { " ", "Not Specified" },
{"aa", "*Afar"}, { "aa", "*Afar" },
{"ab", "*Abkhazian"}, { "ab", "*Abkhazian" },
{"af", "*Afrikaans"}, { "af", "*Afrikaans" },
{"am", "*Amharic"}, { "am", "*Amharic" },
{"ar", "*Arabic"}, { "ar", "*Arabic" },
{"as", "*Assamese"}, { "as", "*Assamese" },
{"ay", "*Aymara"}, { "ay", "*Aymara" },
{"az", "*Azerbaijani"}, { "az", "*Azerbaijani" },
{"ba", "*Bashkir"}, { "ba", "*Bashkir" },
{"be", "*Byelorussian"}, { "be", "*Byelorussian" },
{"bg", "*Bulgarian"}, { "bg", "*Bulgarian" },
{"bh", "*Bihari"}, { "bh", "*Bihari" },
{"bi", "*Bislama"}, { "bi", "*Bislama" },
{"bn", "*Bengali; Bangla"}, { "bn", "*Bengali; Bangla" },
{"bo", "*Tibetan"}, { "bo", "*Tibetan" },
{"br", "*Breton"}, { "br", "*Breton" },
{"ca", "*Catalan"}, { "ca", "*Catalan" },
{"co", "*Corsican"}, { "co", "*Corsican" },
{"cs", "*Czech(Ceske)"}, { "cs", "*Czech(Ceske)" },
{"cy", "*Welsh"}, { "cy", "*Welsh" },
{"da", "Dansk"}, { "da", "Dansk" },
{"de", "Deutsch"}, { "de", "Deutsch" },
{"dz", "*Bhutani"}, { "dz", "*Bhutani" },
{"el", "*Greek"}, { "el", "*Greek" },
{"en", "English"}, { "en", "English" },
{"eo", "*Esperanto"}, { "eo", "*Esperanto" },
{"es", "Espanol"}, { "es", "Espanol" },
{"et", "*Estonian"}, { "et", "*Estonian" },
{"eu", "*Basque"}, { "eu", "*Basque" },
{"fa", "*Persian"}, { "fa", "*Persian" },
{"fi", "Suomi"}, { "fi", "Suomi" },
{"fj", "*Fiji"}, { "fj", "*Fiji" },
{"fo", "*Faroese"}, { "fo", "*Faroese" },
{"fr", "Francais"}, { "fr", "Francais" },
{"fy", "*Frisian"}, { "fy", "*Frisian" },
{"ga", "*Irish"}, { "ga", "*Irish" },
{"gd", "*Scots Gaelic"}, { "gd", "*Scots Gaelic" },
{"gl", "*Galician"}, { "gl", "*Galician" },
{"gn", "*Guarani"}, { "gn", "*Guarani" },
{"gu", "*Gujarati"}, { "gu", "*Gujarati" },
{"ha", "*Hausa"}, { "ha", "*Hausa" },
{"he", "*Hebrew"}, // formerly iw { "he", "*Hebrew" }, /* formerly iw */
{"hi", "*Hindi"}, { "hi", "*Hindi" },
{"hr", "Hrvatski"}, // Croatian { "hr", "Hrvatski" }, /* Croatian */
{"hu", "Magyar"}, { "hu", "Magyar" },
{"hy", "*Armenian"}, { "hy", "*Armenian" },
{"ia", "*Interlingua"}, { "ia", "*Interlingua" },
{"id", "*Indonesian"}, // formerly in { "id", "*Indonesian" }, /* formerly in */
{"ie", "*Interlingue"}, { "ie", "*Interlingue" },
{"ik", "*Inupiak"}, { "ik", "*Inupiak" },
{"in", "*Indonesian"}, // replaced by id { "in", "*Indonesian" }, /* replaced by id */
{"is", "Islenska"}, { "is", "Islenska" },
{"it", "Italiano"}, { "it", "Italiano" },
{"iu", "*Inuktitut"}, { "iu", "*Inuktitut" },
{"iw", "*Hebrew"}, // replaced by he { "iw", "*Hebrew" }, /* replaced by he */
{"ja", "*Japanese"}, { "ja", "*Japanese" },
{"ji", "*Yiddish"}, // replaced by yi { "ji", "*Yiddish" }, /* replaced by yi */
{"jw", "*Javanese"}, { "jw", "*Javanese" },
{"ka", "*Georgian"}, { "ka", "*Georgian" },
{"kk", "*Kazakh"}, { "kk", "*Kazakh" },
{"kl", "*Greenlandic"}, { "kl", "*Greenlandic" },
{"km", "*Cambodian"}, { "km", "*Cambodian" },
{"kn", "*Kannada"}, { "kn", "*Kannada" },
{"ko", "*Korean"}, { "ko", "*Korean" },
{"ks", "*Kashmiri"}, { "ks", "*Kashmiri" },
{"ku", "*Kurdish"}, { "ku", "*Kurdish" },
{"ky", "*Kirghiz"}, { "ky", "*Kirghiz" },
{"la", "*Latin"}, { "la", "*Latin" },
{"ln", "*Lingala"}, { "ln", "*Lingala" },
{"lo", "*Laothian"}, { "lo", "*Laothian" },
{"lt", "*Lithuanian"}, { "lt", "*Lithuanian" },
{"lv", "*Latvian, Lettish"}, { "lv", "*Latvian, Lettish" },
{"mg", "*Malagasy"}, { "mg", "*Malagasy" },
{"mi", "*Maori"}, { "mi", "*Maori" },
{"mk", "*Macedonian"}, { "mk", "*Macedonian" },
{"ml", "*Malayalam"}, { "ml", "*Malayalam" },
{"mn", "*Mongolian"}, { "mn", "*Mongolian" },
{"mo", "*Moldavian"}, { "mo", "*Moldavian" },
{"mr", "*Marathi"}, { "mr", "*Marathi" },
{"ms", "*Malay"}, { "ms", "*Malay" },
{"mt", "*Maltese"}, { "mt", "*Maltese" },
{"my", "*Burmese"}, { "my", "*Burmese" },
{"na", "*Nauru"}, { "na", "*Nauru" },
{"ne", "*Nepali"}, { "ne", "*Nepali" },
{"nl", "Nederlands"}, { "nl", "Nederlands" },
{"no", "Norsk"}, { "no", "Norsk" },
{"oc", "*Occitan"}, { "oc", "*Occitan" },
{"om", "*(Afan) Oromo"}, { "om", "*(Afan) Oromo" },
{"or", "*Oriya"}, { "or", "*Oriya" },
{"pa", "*Punjabi"}, { "pa", "*Punjabi" },
{"pl", "*Polish"}, { "pl", "*Polish" },
{"ps", "*Pashto, Pushto"}, { "ps", "*Pashto, Pushto" },
{"pt", "Portugues"}, { "pt", "Portugues" },
{"qu", "*Quechua"}, { "qu", "*Quechua" },
{"rm", "*Rhaeto-Romance"}, { "rm", "*Rhaeto-Romance" },
{"rn", "*Kirundi"}, { "rn", "*Kirundi" },
{"ro", "*Romanian"}, { "ro", "*Romanian" },
{"ru", "*Russian"}, { "ru", "*Russian" },
{"rw", "*Kinyarwanda"}, { "rw", "*Kinyarwanda" },
{"sa", "*Sanskrit"}, { "sa", "*Sanskrit" },
{"sd", "*Sindhi"}, { "sd", "*Sindhi" },
{"sg", "*Sangho"}, { "sg", "*Sangho" },
{"sh", "*Serbo-Croatian"}, { "sh", "*Serbo-Croatian" },
{"si", "*Sinhalese"}, { "si", "*Sinhalese" },
{"sk", "*Slovak"}, { "sk", "*Slovak" },
{"sl", "*Slovenian"}, { "sl", "*Slovenian" },
{"sm", "*Samoan"}, { "sm", "*Samoan" },
{"sn", "*Shona"}, { "sn", "*Shona" },
{"so", "*Somali"}, { "so", "*Somali" },
{"sq", "*Albanian"}, { "sq", "*Albanian" },
{"sr", "*Serbian"}, { "sr", "*Serbian" },
{"ss", "*Siswati"}, { "ss", "*Siswati" },
{"st", "*Sesotho"}, { "st", "*Sesotho" },
{"su", "*Sundanese"}, { "su", "*Sundanese" },
{"sv", "Svenska"}, { "sv", "Svenska" },
{"sw", "*Swahili"}, { "sw", "*Swahili" },
{"ta", "*Tamil"}, { "ta", "*Tamil" },
{"te", "*Telugu"}, { "te", "*Telugu" },
{"tg", "*Tajik"}, { "tg", "*Tajik" },
{"th", "*Thai"}, { "th", "*Thai" },
{"ti", "*Tigrinya"}, { "ti", "*Tigrinya" },
{"tk", "*Turkmen"}, { "tk", "*Turkmen" },
{"tl", "*Tagalog"}, { "tl", "*Tagalog" },
{"tn", "*Setswana"}, { "tn", "*Setswana" },
{"to", "*Tonga"}, { "to", "*Tonga" },
{"tr", "*Turkish"}, { "tr", "*Turkish" },
{"ts", "*Tsonga"}, { "ts", "*Tsonga" },
{"tt", "*Tatar"}, { "tt", "*Tatar" },
{"tw", "*Twi"}, { "tw", "*Twi" },
{"ug", "*Uighur"}, { "ug", "*Uighur" },
{"uk", "*Ukrainian"}, { "uk", "*Ukrainian" },
{"ur", "*Urdu"}, { "ur", "*Urdu" },
{"uz", "*Uzbek"}, { "uz", "*Uzbek" },
{"vi", "*Vietnamese"}, { "vi", "*Vietnamese" },
{"vo", "*Volapuk"}, { "vo", "*Volapuk" },
{"wo", "*Wolof"}, { "wo", "*Wolof" },
{"xh", "*Xhosa"}, { "xh", "*Xhosa" },
{"yi", "*Yiddish"}, // formerly ji { "yi", "*Yiddish" }, /* formerly ji */
{"yo", "*Yoruba"}, { "yo", "*Yoruba" },
{"za", "*Zhuang"}, { "za", "*Zhuang" },
{"zh", "*Chinese"}, { "zh", "*Chinese" },
{"zu", "*Zulu"}, { "zu", "*Zulu" },
{"\0", ""} { "\0", "" }
}; };
/***************************************************************************** /*****************************************************************************
* Local prototypes * Local prototypes
...@@ -434,7 +435,7 @@ static int DVDSetArea( input_thread_t * p_input, ...@@ -434,7 +435,7 @@ static int DVDSetArea( input_thread_t * p_input,
p_method->ifo.vts.i_pos + p_method->ifo.vts.i_pos +
p_method->ifo.vts.mat.i_tt_vobs_ssector * DVD_LB_SIZE; p_method->ifo.vts.mat.i_tt_vobs_ssector * DVD_LB_SIZE;
CSSGetKey( &(p_method->css) ); CSSGetKey( &(p_method->css) );
intf_WarnMsg( 2, "CSS: VTS key initialized" ); intf_WarnMsg( 2, "css info: VTS key initialized" );
} }
/* /*
...@@ -699,10 +700,10 @@ static void DVDInit( input_thread_t * p_input ) ...@@ -699,10 +700,10 @@ static void DVDInit( input_thread_t * p_input )
if( ( p_input->b_error = p_method->css.b_error ) ) if( ( p_input->b_error = p_method->css.b_error ) )
{ {
intf_ErrMsg( "CSS fatal error" ); intf_ErrMsg( "css error: fatal failure" );
return; return;
} }
intf_WarnMsg( 2, "CSS: initialized" ); intf_WarnMsg( 2, "css info: initialized" );
} }
/* Initialize ES structures */ /* Initialize ES structures */
......
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