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 Hide whitespace changes
Inline Side-by-side
Showing with 1362 additions and 1260 deletions
Makefile.in
View file @ 29670af1
......@@ -487,7 +487,7 @@ show:
# ugliest of all, but I have no time to do it -- sam
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
find -type d | while read i ; \
do mkdir -p /tmp/vlc-@VLC_VERSION@/$$i ; \
......@@ -507,7 +507,7 @@ snapshot:
Makefile.in Makefile.dep configure configure.in install-sh \
config.sub config.guess todo.pl \
/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 \
cp debian/$$file /tmp/vlc-@VLC_VERSION@/debian/ ; done
for file in default8x16.psf default8x9.psf gvlc.png vlc.png ; do \
......@@ -521,28 +521,28 @@ snapshot:
mv /tmp/vlc-@VLC_VERSION@.tar.gz /tmp/vlc-@VLC_VERSION@.tar.bz2 ..
# removing CSS stuff
# find /tmp/vlc-@VLC_VERSION@ -type f -name '*css*' | xargs rm -f
# for x in Makefile.in src/input/input_dvd.c src/input/input_dvd.h ; do \
# rm -f /tmp/vlc-@VLC_VERSION@/$$x ; \
# perl -ne 'if (/^#e(lse|ndif)/) { $$i=0; } \
# if (/^#if.*DVD/) { $$i=1; print "#if 0\n"; } \
# elsif (!$$i || /^#/) { print $$_; }' \
# < $$x | grep -vi css >| /tmp/vlc-@VLC_VERSION@/$$x ; \
# done
# rm -f /tmp/vlc-@VLC_VERSION@/debian/changelog
# sed 's/\(^vlc ([^-]*\)-/\1nocss-/' < debian/changelog \
# > /tmp/vlc-@VLC_VERSION@/debian/changelog
#
# # build nocss archives
# (cd /tmp ; mv vlc-@VLC_VERSION@ vlc-@VLC_VERSION@nocss ; \
# tar cf vlc-@VLC_VERSION@nocss.tar vlc-@VLC_VERSION@nocss ; \
# bzip2 -f -9 < vlc-@VLC_VERSION@nocss.tar \
# > vlc-@VLC_VERSION@nocss.tar.bz2 ; \
# gzip -f -9 vlc-@VLC_VERSION@nocss.tar )
# mv /tmp/vlc-@VLC_VERSION@nocss.tar.gz \
# /tmp/vlc-@VLC_VERSION@nocss.tar.bz2 ..
#
# # clean up
for x in plugins/dvd/dvd.c plugins/dvd/dvd_css.c ; do \
rm -f /tmp/vlc-@VLC_VERSION@/$$x ; \
perl -ne 'if (/^#e(lse|ndif).*HAVE_CSS/) { $$i=0; } \
if (/^#if.*HAVE_CSS/) { $$i=1; } \
elsif (!$$i && !/^#.*HAVE_CSS/) { print $$_; }' \
< $$x >| /tmp/vlc-@VLC_VERSION@/$$x ; \
done
rm -f /tmp/vlc-@VLC_VERSION@/plugins/dvd/dvd_csstables.c
rm -f /tmp/vlc-@VLC_VERSION@/debian/changelog
sed 's/\(^vlc ([^-]*\)-/\1nocss-/' < debian/changelog \
> /tmp/vlc-@VLC_VERSION@/debian/changelog
# build nocss archives
(cd /tmp ; mv vlc-@VLC_VERSION@ vlc-@VLC_VERSION@nocss ; \
tar cf vlc-@VLC_VERSION@nocss.tar vlc-@VLC_VERSION@nocss ; \
bzip2 -f -9 < vlc-@VLC_VERSION@nocss.tar \
> vlc-@VLC_VERSION@nocss.tar.bz2 ; \
gzip -f -9 vlc-@VLC_VERSION@nocss.tar )
mv /tmp/vlc-@VLC_VERSION@nocss.tar.gz \
/tmp/vlc-@VLC_VERSION@nocss.tar.bz2 ..
# clean up
rm -rf /tmp/vlc-@VLC_VERSION@*
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,
[ --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${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,
[ --enable-debug Enable debug mode (default disabled)],
[ if test x$enableval = xyes; then DEBUG=1; fi ])
......@@ -225,6 +229,7 @@ AC_SUBST(ALIASES)
AC_SUBST(DEBUG)
AC_SUBST(STATS)
AC_SUBST(OPTIMS)
AC_SUBST(CSS)
AC_SUBST(DYNAMIC_FLAG)
AC_SUBST(LIB_SDL)
AC_SUBST(LIB_GLIDE)
......@@ -241,6 +246,7 @@ architecture : ${ARCH}
debug mode : ${DEBUG}
statistics : ${STATS}
optimizations : ${OPTIMS}
CSS decryption : ${CSS}
plugins : ${PLUGINS}
vlc aliases : ${ALIASES}
"
......
debian/control
View file @ 29670af1
......@@ -2,7 +2,7 @@ Source: vlc
Section: graphics
Priority: optional
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
Package: vlc
......
include/defs.h.in
View file @ 29670af1
......@@ -163,3 +163,6 @@
/* DVD support for linux */
#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 );
MODULE_INIT
{
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->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 @@
* -dvd_udf to find files
*****************************************************************************
* 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>
*
......@@ -83,157 +83,158 @@ static struct
{
char p_code[3];
char p_lang_long[20];
} lang_tbl[] =
{
}
lang_tbl[] =
{
/* The ISO 639 language codes.
* Language names with * prefix are not spelled in their own language
*/
{" ", "Not Specified"},
{"aa", "*Afar"},
{"ab", "*Abkhazian"},
{"af", "*Afrikaans"},
{"am", "*Amharic"},
{"ar", "*Arabic"},
{"as", "*Assamese"},
{"ay", "*Aymara"},
{"az", "*Azerbaijani"},
{"ba", "*Bashkir"},
{"be", "*Byelorussian"},
{"bg", "*Bulgarian"},
{"bh", "*Bihari"},
{"bi", "*Bislama"},
{"bn", "*Bengali; Bangla"},
{"bo", "*Tibetan"},
{"br", "*Breton"},
{"ca", "*Catalan"},
{"co", "*Corsican"},
{"cs", "*Czech(Ceske)"},
{"cy", "*Welsh"},
{"da", "Dansk"},
{"de", "Deutsch"},
{"dz", "*Bhutani"},
{"el", "*Greek"},
{"en", "English"},
{"eo", "*Esperanto"},
{"es", "Espanol"},
{"et", "*Estonian"},
{"eu", "*Basque"},
{"fa", "*Persian"},
{"fi", "Suomi"},
{"fj", "*Fiji"},
{"fo", "*Faroese"},
{"fr", "Francais"},
{"fy", "*Frisian"},
{"ga", "*Irish"},
{"gd", "*Scots Gaelic"},
{"gl", "*Galician"},
{"gn", "*Guarani"},
{"gu", "*Gujarati"},
{"ha", "*Hausa"},
{"he", "*Hebrew"}, // formerly iw
{"hi", "*Hindi"},
{"hr", "Hrvatski"}, // Croatian
{"hu", "Magyar"},
{"hy", "*Armenian"},
{"ia", "*Interlingua"},
{"id", "*Indonesian"}, // formerly in
{"ie", "*Interlingue"},
{"ik", "*Inupiak"},
{"in", "*Indonesian"}, // replaced by id
{"is", "Islenska"},
{"it", "Italiano"},
{"iu", "*Inuktitut"},
{"iw", "*Hebrew"}, // replaced by he
{"ja", "*Japanese"},
{"ji", "*Yiddish"}, // replaced by yi
{"jw", "*Javanese"},
{"ka", "*Georgian"},
{"kk", "*Kazakh"},
{"kl", "*Greenlandic"},
{"km", "*Cambodian"},
{"kn", "*Kannada"},
{"ko", "*Korean"},
{"ks", "*Kashmiri"},
{"ku", "*Kurdish"},
{"ky", "*Kirghiz"},
{"la", "*Latin"},
{"ln", "*Lingala"},
{"lo", "*Laothian"},
{"lt", "*Lithuanian"},
{"lv", "*Latvian, Lettish"},
{"mg", "*Malagasy"},
{"mi", "*Maori"},
{"mk", "*Macedonian"},
{"ml", "*Malayalam"},
{"mn", "*Mongolian"},
{"mo", "*Moldavian"},
{"mr", "*Marathi"},
{"ms", "*Malay"},
{"mt", "*Maltese"},
{"my", "*Burmese"},
{"na", "*Nauru"},
{"ne", "*Nepali"},
{"nl", "Nederlands"},
{"no", "Norsk"},
{"oc", "*Occitan"},
{"om", "*(Afan) Oromo"},
{"or", "*Oriya"},
{"pa", "*Punjabi"},
{"pl", "*Polish"},
{"ps", "*Pashto, Pushto"},
{"pt", "Portugues"},
{"qu", "*Quechua"},
{"rm", "*Rhaeto-Romance"},
{"rn", "*Kirundi"},
{"ro", "*Romanian"},
{"ru", "*Russian"},
{"rw", "*Kinyarwanda"},
{"sa", "*Sanskrit"},
{"sd", "*Sindhi"},
{"sg", "*Sangho"},
{"sh", "*Serbo-Croatian"},
{"si", "*Sinhalese"},
{"sk", "*Slovak"},
{"sl", "*Slovenian"},
{"sm", "*Samoan"},
{"sn", "*Shona"},
{"so", "*Somali"},
{"sq", "*Albanian"},
{"sr", "*Serbian"},
{"ss", "*Siswati"},
{"st", "*Sesotho"},
{"su", "*Sundanese"},
{"sv", "Svenska"},
{"sw", "*Swahili"},
{"ta", "*Tamil"},
{"te", "*Telugu"},
{"tg", "*Tajik"},
{"th", "*Thai"},
{"ti", "*Tigrinya"},
{"tk", "*Turkmen"},
{"tl", "*Tagalog"},
{"tn", "*Setswana"},
{"to", "*Tonga"},
{"tr", "*Turkish"},
{"ts", "*Tsonga"},
{"tt", "*Tatar"},
{"tw", "*Twi"},
{"ug", "*Uighur"},
{"uk", "*Ukrainian"},
{"ur", "*Urdu"},
{"uz", "*Uzbek"},
{"vi", "*Vietnamese"},
{"vo", "*Volapuk"},
{"wo", "*Wolof"},
{"xh", "*Xhosa"},
{"yi", "*Yiddish"}, // formerly ji
{"yo", "*Yoruba"},
{"za", "*Zhuang"},
{"zh", "*Chinese"},
{"zu", "*Zulu"},
{"\0", ""}
};
{ " ", "Not Specified" },
{ "aa", "*Afar" },
{ "ab", "*Abkhazian" },
{ "af", "*Afrikaans" },
{ "am", "*Amharic" },
{ "ar", "*Arabic" },
{ "as", "*Assamese" },
{ "ay", "*Aymara" },
{ "az", "*Azerbaijani" },
{ "ba", "*Bashkir" },
{ "be", "*Byelorussian" },
{ "bg", "*Bulgarian" },
{ "bh", "*Bihari" },
{ "bi", "*Bislama" },
{ "bn", "*Bengali; Bangla" },
{ "bo", "*Tibetan" },
{ "br", "*Breton" },
{ "ca", "*Catalan" },
{ "co", "*Corsican" },
{ "cs", "*Czech(Ceske)" },
{ "cy", "*Welsh" },
{ "da", "Dansk" },
{ "de", "Deutsch" },
{ "dz", "*Bhutani" },
{ "el", "*Greek" },
{ "en", "English" },
{ "eo", "*Esperanto" },
{ "es", "Espanol" },
{ "et", "*Estonian" },
{ "eu", "*Basque" },
{ "fa", "*Persian" },
{ "fi", "Suomi" },
{ "fj", "*Fiji" },
{ "fo", "*Faroese" },
{ "fr", "Francais" },
{ "fy", "*Frisian" },
{ "ga", "*Irish" },
{ "gd", "*Scots Gaelic" },
{ "gl", "*Galician" },
{ "gn", "*Guarani" },
{ "gu", "*Gujarati" },
{ "ha", "*Hausa" },
{ "he", "*Hebrew" }, /* formerly iw */
{ "hi", "*Hindi" },
{ "hr", "Hrvatski" }, /* Croatian */
{ "hu", "Magyar" },
{ "hy", "*Armenian" },
{ "ia", "*Interlingua" },
{ "id", "*Indonesian" }, /* formerly in */
{ "ie", "*Interlingue" },
{ "ik", "*Inupiak" },
{ "in", "*Indonesian" }, /* replaced by id */
{ "is", "Islenska" },
{ "it", "Italiano" },
{ "iu", "*Inuktitut" },
{ "iw", "*Hebrew" }, /* replaced by he */
{ "ja", "*Japanese" },
{ "ji", "*Yiddish" }, /* replaced by yi */
{ "jw", "*Javanese" },
{ "ka", "*Georgian" },
{ "kk", "*Kazakh" },
{ "kl", "*Greenlandic" },
{ "km", "*Cambodian" },
{ "kn", "*Kannada" },
{ "ko", "*Korean" },
{ "ks", "*Kashmiri" },
{ "ku", "*Kurdish" },
{ "ky", "*Kirghiz" },
{ "la", "*Latin" },
{ "ln", "*Lingala" },
{ "lo", "*Laothian" },
{ "lt", "*Lithuanian" },
{ "lv", "*Latvian, Lettish" },
{ "mg", "*Malagasy" },
{ "mi", "*Maori" },
{ "mk", "*Macedonian" },
{ "ml", "*Malayalam" },
{ "mn", "*Mongolian" },
{ "mo", "*Moldavian" },
{ "mr", "*Marathi" },
{ "ms", "*Malay" },
{ "mt", "*Maltese" },
{ "my", "*Burmese" },
{ "na", "*Nauru" },
{ "ne", "*Nepali" },
{ "nl", "Nederlands" },
{ "no", "Norsk" },
{ "oc", "*Occitan" },
{ "om", "*(Afan) Oromo" },
{ "or", "*Oriya" },
{ "pa", "*Punjabi" },
{ "pl", "*Polish" },
{ "ps", "*Pashto, Pushto" },
{ "pt", "Portugues" },
{ "qu", "*Quechua" },
{ "rm", "*Rhaeto-Romance" },
{ "rn", "*Kirundi" },
{ "ro", "*Romanian" },
{ "ru", "*Russian" },
{ "rw", "*Kinyarwanda" },
{ "sa", "*Sanskrit" },
{ "sd", "*Sindhi" },
{ "sg", "*Sangho" },
{ "sh", "*Serbo-Croatian" },
{ "si", "*Sinhalese" },
{ "sk", "*Slovak" },
{ "sl", "*Slovenian" },
{ "sm", "*Samoan" },
{ "sn", "*Shona" },
{ "so", "*Somali" },
{ "sq", "*Albanian" },
{ "sr", "*Serbian" },
{ "ss", "*Siswati" },
{ "st", "*Sesotho" },
{ "su", "*Sundanese" },
{ "sv", "Svenska" },
{ "sw", "*Swahili" },
{ "ta", "*Tamil" },
{ "te", "*Telugu" },
{ "tg", "*Tajik" },
{ "th", "*Thai" },
{ "ti", "*Tigrinya" },
{ "tk", "*Turkmen" },
{ "tl", "*Tagalog" },
{ "tn", "*Setswana" },
{ "to", "*Tonga" },
{ "tr", "*Turkish" },
{ "ts", "*Tsonga" },
{ "tt", "*Tatar" },
{ "tw", "*Twi" },
{ "ug", "*Uighur" },
{ "uk", "*Ukrainian" },
{ "ur", "*Urdu" },
{ "uz", "*Uzbek" },
{ "vi", "*Vietnamese" },
{ "vo", "*Volapuk" },
{ "wo", "*Wolof" },
{ "xh", "*Xhosa" },
{ "yi", "*Yiddish" }, /* formerly ji */
{ "yo", "*Yoruba" },
{ "za", "*Zhuang" },
{ "zh", "*Chinese" },
{ "zu", "*Zulu" },
{ "\0", "" }
};
/*****************************************************************************
* Local prototypes
......@@ -434,7 +435,7 @@ static int DVDSetArea( input_thread_t * p_input,
p_method->ifo.vts.i_pos +
p_method->ifo.vts.mat.i_tt_vobs_ssector * DVD_LB_SIZE;
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 )
if( ( p_input->b_error = p_method->css.b_error ) )
{
intf_ErrMsg( "CSS fatal error" );
intf_ErrMsg( "css error: fatal failure" );
return;
}
intf_WarnMsg( 2, "CSS: initialized" );
intf_WarnMsg( 2, "css info: initialized" );
}
/* 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