From 56afe807c2d528a7d3428c2342e0bbff25a48b01 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Tue, 11 Dec 2001 14:43:38 +0000 Subject: [PATCH] =?utf8?q?=20=20*=20Added=20vlc-arts=20to=20the=20debian?= =?utf8?q?=20package=20generation.=20=20=20*=20HP-UX=20port=20of=20the=20D?= =?utf8?q?VD=20ioctls=20courtesy=20of=20David=20Sieb=EF=BF=BDrger.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- ABOUT-NLS | 324 +++++++++++++++++++++++++++++++++++++++ AUTHORS | 4 + ChangeLog.libdvdcss | 2 +- configure | 149 ++++++++++++------ configure.in | 8 + debian/control | 10 +- debian/rules | 8 +- extras/libdvdcss/ioctl.c | 137 ++++++++++++++++- extras/libdvdcss/ioctl.h | 17 +- include/defs.h.in | 3 + 10 files changed, 604 insertions(+), 58 deletions(-) create mode 100644 ABOUT-NLS diff --git a/ABOUT-NLS b/ABOUT-NLS new file mode 100644 index 0000000000..5fde45a0b5 --- /dev/null +++ b/ABOUT-NLS @@ -0,0 +1,324 @@ +Notes on the Free Translation Project +************************************* + + Free software is going international! The Free Translation Project +is a way to get maintainers of free software, translators, and users all +together, so that will gradually become able to speak many languages. +A few packages already provide translations for their messages. + + If you found this `ABOUT-NLS' file inside a distribution, you may +assume that the distributed package does use GNU `gettext' internally, +itself available at your nearest GNU archive site. But you do _not_ +need to install GNU `gettext' prior to configuring, installing or using +this package with messages translated. + + Installers will find here some useful hints. These notes also +explain how users should proceed for getting the programs to use the +available translations. They tell how people wanting to contribute and +work at translations should contact the appropriate team. + + When reporting bugs in the `intl/' directory or bugs which may be +related to internationalization, you should tell about the version of +`gettext' which is used. The information can be found in the +`intl/VERSION' file, in internationalized packages. + +Quick configuration advice +========================== + + If you want to exploit the full power of internationalization, you +should configure it using + + ./configure --with-included-gettext + +to force usage of internationalizing routines provided within this +package, despite the existence of internationalizing capabilities in the +operating system where this package is being installed. So far, only +the `gettext' implementation in the GNU C library version 2 provides as +many features (such as locale alias, message inheritance, automatic +charset conversion or plural form handling) as the implementation here. +It is also not possible to offer this additional functionality on top +of a `catgets' implementation. Future versions of GNU `gettext' will +very likely convey even more functionality. So it might be a good idea +to change to GNU `gettext' as soon as possible. + + So you need _not_ provide this option if you are using GNU libc 2 or +you have installed a recent copy of the GNU gettext package with the +included `libintl'. + +INSTALL Matters +=============== + + Some packages are "localizable" when properly installed; the +programs they contain can be made to speak your own native language. +Most such packages use GNU `gettext'. Other packages have their own +ways to internationalization, predating GNU `gettext'. + + By default, this package will be installed to allow translation of +messages. It will automatically detect whether the system already +provides the GNU `gettext' functions. If not, the GNU `gettext' own +library will be used. This library is wholly contained within this +package, usually in the `intl/' subdirectory, so prior installation of +the GNU `gettext' package is _not_ required. Installers may use +special options at configuration time for changing the default +behaviour. The commands: + + ./configure --with-included-gettext + ./configure --disable-nls + +will respectively bypass any pre-existing `gettext' to use the +internationalizing routines provided within this package, or else, +_totally_ disable translation of messages. + + When you already have GNU `gettext' installed on your system and run +configure without an option for your new package, `configure' will +probably detect the previously built and installed `libintl.a' file and +will decide to use this. This might be not what is desirable. You +should use the more recent version of the GNU `gettext' library. I.e. +if the file `intl/VERSION' shows that the library which comes with this +package is more recent, you should use + + ./configure --with-included-gettext + +to prevent auto-detection. + + The configuration process will not test for the `catgets' function +and therefore it will not be used. The reason is that even an +emulation of `gettext' on top of `catgets' could not provide all the +extensions of the GNU `gettext' library. + + Internationalized packages have usually many `po/LL.po' files, where +LL gives an ISO 639 two-letter code identifying the language. Unless +translations have been forbidden at `configure' time by using the +`--disable-nls' switch, all available translations are installed +together with the package. However, the environment variable `LINGUAS' +may be set, prior to configuration, to limit the installed set. +`LINGUAS' should then contain a space separated list of two-letter +codes, stating which languages are allowed. + +Using This Package +================== + + As a user, if your language has been installed for this package, you +only have to set the `LANG' environment variable to the appropriate +`LL_CC' combination. Here `LL' is an ISO 639 two-letter language code, +and `CC' is an ISO 3166 two-letter country code. For example, let's +suppose that you speak German and live in Germany. At the shell +prompt, merely execute `setenv LANG de_DE' (in `csh'), +`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash'). +This can be done from your `.login' or `.profile' file, once and for +all. + + You might think that the country code specification is redundant. +But in fact, some languages have dialects in different countries. For +example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The +country code serves to distinguish the dialects. + + Not all programs have translations for all languages. By default, an +English message is shown in place of a nonexistent translation. If you +understand other languages, you can set up a priority list of languages. +This is done through a different environment variable, called +`LANGUAGE'. GNU `gettext' gives preference to `LANGUAGE' over `LANG' +for the purpose of message handling, but you still need to have `LANG' +set to the primary language; this is required by other parts of the +system libraries. For example, some Swedish users who would rather +read translations in German than English for when Swedish is not +available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'. + + In the `LANGUAGE' environment variable, but not in the `LANG' +environment variable, `LL_CC' combinations can be abbreviated as `LL' +to denote the language's main dialect. For example, `de' is equivalent +to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT' +(Portuguese as spoken in Portugal) in this context. + +Translating Teams +================= + + For the Free Translation Project to be a success, we need interested +people who like their own language and write it well, and who are also +able to synergize with other translators speaking the same language. +Each translation team has its own mailing list. The up-to-date list of +teams can be found at the Free Translation Project's homepage, +`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams" +area. + + If you'd like to volunteer to _work_ at translating messages, you +should become a member of the translating team for your own language. +The subscribing address is _not_ the same as the list itself, it has +`-request' appended. For example, speakers of Swedish can send a +message to `sv-request@li.org', having this message body: + + subscribe + + Keep in mind that team members are expected to participate +_actively_ in translations, or at solving translational difficulties, +rather than merely lurking around. If your team does not exist yet and +you want to start one, or if you are unsure about what to do or how to +get started, please write to `translation@iro.umontreal.ca' to reach the +coordinator for all translator teams. + + The English team is special. It works at improving and uniformizing +the terminology in use. Proven linguistic skill are praised more than +programming skill, here. + +Available Packages +================== + + Languages are not equally supported in all packages. The following +matrix shows the current state of internationalization, as of September +2001. The matrix shows, in regard of each package, for which languages +PO files have been submitted to translation coordination, with a +translation percentage of at least 50%. + + Ready PO files bg cs da de el en eo es et fi fr gl he hr id it ja + +----------------------------------------------------+ + a2ps | [] [] [] | + bash | [] [] [] [] | + bfd | | + binutils | [] | + bison | [] [] [] [] [] | + clisp | [] [] [] [] | + cpio | [] [] [] [] [] | + diffutils | [] [] [] [] [] [] [] | + enscript | [] [] | + error | [] [] | + fetchmail | | + fileutils | [] [] [] [] [] [] [] [] | + findutils | [] [] [] [] [] [] [] [] | + flex | [] [] [] | + freetype | | + gas | | + gawk | [] [] | + gcal | | + gcc | | + gettext | [] [] [] [] [] [] [] [] [] [] | + gnupg | [] [] [] [] [] [] [] | + gprof | | + grep | [] [] [] [] [] [] [] [] | + hello | [] [] [] [] [] [] [] [] [] [] [] | + id-utils | [] [] [] | + indent | [] [] [] [] [] | + jpilot | [] | + kbd | | + ld | [] | + libc | [] [] [] [] [] [] [] [] | + lilypond | [] | + lynx | [] [] [] [] | + m4 | [] [] [] [] [] [] [] [] | + make | [] [] [] [] [] [] | + mysecretdiary | [] | + nano | [] [] [] | + opcodes | | + parted | [] [] [] | + ptx | [] [] [] [] [] [] [] | + python | | + recode | [] [] [] [] [] [] [] [] [] | + sed | [] [] [] [] [] [] [] [] [] [] [] [] | + sh-utils | [] [] [] [] [] [] [] [] [] [] | + sharutils | [] [] [] [] [] [] [] [] | + sketch | | + soundtracker | [] [] [] | + sp | | + tar | [] [] [] [] [] [] [] [] | + texinfo | [] [] [] [] [] [] | + textutils | [] [] [] [] [] [] [] [] | + util-linux | [] [] | + wdiff | [] [] [] | + wget | [] [] [] [] [] [] [] [] [] [] | + +----------------------------------------------------+ + bg cs da de el en eo es et fi fr gl he hr id it ja + 0 14 24 32 11 1 8 23 13 1 33 22 4 0 7 9 18 + + ko lv nb nl nn no pl pt pt_BR ru sk sl sv tr uk zh + +----------------------------------------------------+ + a2ps | [] [] [] | 6 + bash | | 4 + bfd | | 0 + binutils | | 1 + bison | [] | 6 + clisp | [] | 5 + cpio | [] [] [] [] [] | 10 + diffutils | [] [] [] [] | 11 + enscript | [] [] [] | 5 + error | [] [] | 4 + fetchmail | | 0 + fileutils | [] [] [] [] [] [] [] [] [] | 17 + findutils | [] [] [] [] [] [] [] [] | 16 + flex | [] [] [] | 6 + freetype | | 0 + gas | | 0 + gawk | [] | 3 + gcal | | 0 + gcc | | 0 + gettext | [] [] [] [] [] [] [] [] | 18 + gnupg | [] [] [] | 10 + gprof | | 0 + grep | [] [] [] [] | 12 + hello | [] [] [] [] [] [] [] [] [] [] [] | 22 + id-utils | [] [] [] | 6 + indent | [] [] [] [] [] [] [] | 12 + jpilot | | 1 + kbd | [] | 1 + ld | | 1 + libc | [] [] [] [] [] [] [] [] | 16 + lilypond | [] [] | 3 + lynx | [] [] [] [] | 8 + m4 | [] [] [] [] | 12 + make | [] [] [] [] [] [] | 12 + mysecretdiary | | 1 + nano | [] | 4 + opcodes | [] | 1 + parted | [] [] | 5 + ptx | [] [] [] [] [] [] [] [] | 15 + python | | 0 + recode | [] [] [] [] | 13 + sed | [] [] [] [] [] [] [] | 19 + sh-utils | [] [] [] [] [] [] [] [] [] [] [] | 21 + sharutils | [] [] [] | 11 + sketch | | 0 + soundtracker | | 3 + sp | | 0 + tar | [] [] [] [] [] [] [] | 15 + texinfo | [] | 7 + textutils | [] [] [] [] [] [] [] [] | 16 + util-linux | [] [] | 4 + wdiff | [] [] [] [] | 7 + wget | [] [] [] [] [] [] [] | 17 + +----------------------------------------------------+ + 33 teams ko lv nb nl nn no pl pt pt_BR ru sk sl sv tr uk zh + 53 domains 9 1 6 20 0 6 17 1 13 25 10 11 23 21 2 2 387 + + Some counters in the preceding matrix are higher than the number of +visible blocks let us expect. This is because a few extra PO files are +used for implementing regional variants of languages, or language +dialects. + + For a PO file in the matrix above to be effective, the package to +which it applies should also have been internationalized and +distributed as such by its maintainer. There might be an observable +lag between the mere existence a PO file and its wide availability in a +distribution. + + If September 2001 seems to be old, you may fetch a more recent copy +of this `ABOUT-NLS' file on most GNU archive sites. The most +up-to-date matrix with full percentage details can be found at +`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'. + +Using `gettext' in new packages +=============================== + + If you are writing a freely available program and want to +internationalize it you are welcome to use GNU `gettext' in your +package. Of course you have to respect the GNU Library General Public +License which covers the use of the GNU `gettext' library. This means +in particular that even non-free programs can use `libintl' as a shared +library, whereas only free software can use `libintl' as a static +library or use modified versions of `libintl'. + + Once the sources are changed appropriately and the setup can handle +to use of `gettext' the only thing missing are the translations. The +Free Translation Project is also available for packages which are not +developed inside the GNU project. Therefore the information given above +applies also for every other Free Software Project. Contact +`translation@iro.umontreal.ca' to make the `.pot' files available to +the translation teams. + diff --git a/AUTHORS b/AUTHORS index d5bbdbd65c..8877646850 100644 --- a/AUTHORS +++ b/AUTHORS @@ -244,6 +244,10 @@ E: richard@rshepherd.demon.co.uk C: richards D: BeOS video output (BBitmap and Overlay) +N: David Siebörger +E: drs-videolan@rucus.ru.ac.za +D: HP-UX port of the DVD ioctls + N: Espen Skoglund E: esk@ira.uka.de D: FreeBSD autoconf and Makefile patches diff --git a/ChangeLog.libdvdcss b/ChangeLog.libdvdcss index 7339dbc219..4de67264ad 100644 --- a/ChangeLog.libdvdcss +++ b/ChangeLog.libdvdcss @@ -4,7 +4,7 @@ HEAD - * Nothing yet + * HP-UX port courtesy of David Siebörger . 1.0.1 Fri, 7 Dec 2001 20:18:56 +0100 diff --git a/configure b/configure index e77724aa60..3d8f7d876a 100755 --- a/configure +++ b/configure @@ -6219,6 +6219,57 @@ else fi +else + echo "$ac_t""no" 1>&6 +fi + + ac_safe=`echo "sys/scsi.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for sys/scsi.h""... $ac_c" 1>&6 +echo "configure:6229: checking for sys/scsi.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:6239: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + cat > conftest.$ac_ext < +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "sctl_io" >/dev/null 2>&1; then + rm -rf conftest* + + cat >> confdefs.h <<\EOF +#define HPUX_SCTL_IO 1 +EOF + + +fi +rm -f conftest* + + else echo "$ac_t""no" 1>&6 fi @@ -6348,7 +6399,7 @@ if test "${enable_pth+set}" = set; then enableval="$enable_pth" if test x$enableval = xyes; then echo $ac_n "checking for pth_init in -lpth""... $ac_c" 1>&6 -echo "configure:6352: checking for pth_init in -lpth" >&5 +echo "configure:6403: checking for pth_init in -lpth" >&5 ac_lib_var=`echo pth'_'pth_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6356,7 +6407,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpth $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6395,7 +6446,7 @@ else fi cat > conftest.$ac_ext < EOF @@ -6516,7 +6567,7 @@ fi if test x$enable_vcd != xno then cat > conftest.$ac_ext < EOF @@ -6590,17 +6641,17 @@ if test "${with_mad+set}" = set; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6594: checking for $ac_hdr" >&5 +echo "configure:6645: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6604: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6655: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6630,7 +6681,7 @@ fi done echo $ac_n "checking for mad_bit_init in -lmad""... $ac_c" 1>&6 -echo "configure:6634: checking for mad_bit_init in -lmad" >&5 +echo "configure:6685: checking for mad_bit_init in -lmad" >&5 ac_lib_var=`echo mad'_'mad_bit_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6638,7 +6689,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmad $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6718,7 +6769,7 @@ if test "${enable_esd+set}" = set; then # Extract the first word of "esd-config", so it can be a program name with args. set dummy esd-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6722: checking for $ac_word" >&5 +echo "configure:6773: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6769,7 +6820,7 @@ if test "${enable_arts+set}" = set; then # Extract the first word of "artsc-config", so it can be a program name with args. set dummy artsc-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6773: checking for $ac_word" >&5 +echo "configure:6824: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ARTS_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6826,17 +6877,17 @@ else do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6830: checking for $ac_hdr" >&5 +echo "configure:6881: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6840: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6891: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6880,17 +6931,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6884: checking for $ac_hdr" >&5 +echo "configure:6935: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6894: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6968,7 +7019,7 @@ fi # Extract the first word of "sdl12-config", so it can be a program name with args. set dummy sdl12-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6972: checking for $ac_word" >&5 +echo "configure:7023: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SDL12_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7008,7 +7059,7 @@ fi # Extract the first word of "sdl11-config", so it can be a program name with args. set dummy sdl11-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7012: checking for $ac_word" >&5 +echo "configure:7063: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SDL11_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7049,7 +7100,7 @@ fi # Extract the first word of "sdl-config", so it can be a program name with args. set dummy sdl-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7053: checking for $ac_word" >&5 +echo "configure:7104: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7095,17 +7146,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7099: checking for $ac_hdr" >&5 +echo "configure:7150: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7109: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7160: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7175,17 +7226,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7179: checking for $ac_hdr" >&5 +echo "configure:7230: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7189: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7214,7 +7265,7 @@ done else echo $ac_n "checking for directX headers in ${withval}""... $ac_c" 1>&6 -echo "configure:7218: checking for directX headers in ${withval}" >&5 +echo "configure:7269: checking for directX headers in ${withval}" >&5 if test -f ${withval}/include/directx.h then PLUGINS="${PLUGINS} directx" @@ -7297,7 +7348,7 @@ if test "${enable_gnome+set}" = set; then # Extract the first word of "gnome-config", so it can be a program name with args. set dummy gnome-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7301: checking for $ac_word" >&5 +echo "configure:7352: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7342,17 +7393,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7346: checking for $ac_hdr" >&5 +echo "configure:7397: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7356: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7407: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7412,7 +7463,7 @@ fi # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7416: checking for $ac_word" >&5 +echo "configure:7467: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7458,17 +7509,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7462: checking for $ac_hdr" >&5 +echo "configure:7513: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7472: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7523: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7524,17 +7575,17 @@ if test x$enable_x11 != xno && do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7528: checking for $ac_hdr" >&5 +echo "configure:7579: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7538: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7587,17 +7638,17 @@ if test x$enable_xvideo != xno && do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7591: checking for $ac_hdr" >&5 +echo "configure:7642: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7601: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7637,17 +7688,17 @@ if test "${enable_alsa+set}" = set; then then ac_safe=`echo "alsa/asoundlib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for alsa/asoundlib.h""... $ac_c" 1>&6 -echo "configure:7641: checking for alsa/asoundlib.h" >&5 +echo "configure:7692: checking for alsa/asoundlib.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7651: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7664,7 +7715,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6 -echo "configure:7668: checking for main in -lasound" >&5 +echo "configure:7719: checking for main in -lasound" >&5 ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7672,14 +7723,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lasound $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else diff --git a/configure.in b/configure.in index c8ee0f1d0f..28cc8fbe02 100644 --- a/configure.in +++ b/configure.in @@ -512,6 +512,14 @@ AC_CHECK_HEADERS(sys/ioctl.h,[ ]) ]) dnl + dnl HP-UX: sys/scsi.h + dnl + AC_CHECK_HEADER(sys/scsi.h,[ + AC_EGREP_HEADER(sctl_io,sys/scsi.h,[ + AC_DEFINE(HPUX_SCTL_IO, 1, Define if defines sctl_io.) + ]) + ]) + dnl dnl Final tests to check what was detected dnl if test x$LINUX_DVD_STRUCT = x1; then diff --git a/debian/control b/debian/control index 1891373adb..3ff7b1204b 100644 --- a/debian/control +++ b/debian/control @@ -115,4 +115,12 @@ Description: MAD plugin for vlc VideoLAN is a free MPEG, MPEG2 and DVD software solution. . This plugin adds support for libmad, the MPEG audio decoder library, to - the VideoLAN Client. MAD is 100% fixed-point based. + the VideoLAN Client. MAD is 100% fixed-point based.Package: vlc-mad + +Architecture: any +Depends: vlc (= ${Source-Version}), ${shlibs:Depends} +Description: aRts plugin for vlc + VideoLAN is a free MPEG, MPEG2 and DVD software solution. + . + This plugin adds support for the aRts Sound System to vlc, the + VideoLAN Client. diff --git a/debian/rules b/debian/rules index ccb865da50..109c705a23 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,7 @@ export DH_COMPAT=3 # Compilation options -export CONFIG_FLAGS="--enable-release --prefix=/usr --enable-gnome --enable-gtk --enable-fb --with-ggi --enable-sdl --enable-esd --enable-qt --with-mad" +export CONFIG_FLAGS="--enable-release --prefix=/usr --enable-gnome --enable-gtk --enable-fb --with-ggi --enable-sdl --enable-esd --enable-qt --with-mad --enable-arts" export LIBDVDCSS_FLAGS="--with-dvdcss=local-shared" export VIDDIR="usr/share/videolan" export PIXDIR="usr/share/pixmaps" @@ -59,11 +59,11 @@ install: build # make symlinks for packages and install plugins case $(DEB_BUILD_ARCH) in \ i386) \ - ARCH_ALIASES="ggi gtk gnome esd sdl qt alsa glide" ;; \ + ARCH_ALIASES="ggi gtk gnome esd sdl qt arts alsa glide" ;; \ alpha|ia64|m68k|powerpc) \ - ARCH_ALIASES="ggi gtk gnome esd sdl qt alsa" ;; \ + ARCH_ALIASES="ggi gtk gnome esd sdl qt arts alsa" ;; \ *) \ - ARCH_ALIASES="ggi gtk gnome esd sdl qt" ;; \ + ARCH_ALIASES="ggi gtk gnome esd sdl qt arts" ;; \ esac ;\ for alias in $$ARCH_ALIASES ; do \ ln -s vlc debian/vlc-$$alias/usr/share/doc/vlc-$$alias ; \ diff --git a/extras/libdvdcss/ioctl.c b/extras/libdvdcss/ioctl.c index fe26db05f9..7b18d172bf 100644 --- a/extras/libdvdcss/ioctl.c +++ b/extras/libdvdcss/ioctl.c @@ -2,13 +2,14 @@ * ioctl.c: DVD ioctl replacement function ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN - * $Id: ioctl.c,v 1.15 2001/12/09 17:01:35 sam Exp $ + * $Id: ioctl.c,v 1.16 2001/12/11 14:43:38 sam Exp $ * * Authors: Markus Kuespert * Samuel Hocevar * Jon Lech Johansen * Håkan Hjort * Eugenio Jarosiewicz + * David Siebörger * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -62,6 +63,9 @@ # include # include #endif +#ifdef HPUX_SCTL_IO +# include +#endif #ifdef SOLARIS_USCSI # include # include @@ -86,6 +90,13 @@ static void BeInitRDC ( raw_device_command *, int ); #endif +/***************************************************************************** + * Local prototypes, HP-UX specific + *****************************************************************************/ +#if defined( HPUX_SCTL_IO ) +static void HPUXInitSCTL ( struct sctl_io *sctl_io, int i_type ); +#endif + /***************************************************************************** * Local prototypes, Solaris specific *****************************************************************************/ @@ -138,6 +149,16 @@ int ioctl_ReadCopyright( int i_fd, int i_layer, int *pi_copyright ) *pi_copyright = p_buffer[ 4 ]; +#elif defined( HPUX_SCTL_IO ) + INIT_SCTL_IO( GPCMD_READ_DVD_STRUCTURE, 8 ); + + sctl_io.cdb[ 6 ] = i_layer; + sctl_io.cdb[ 7 ] = DVD_STRUCT_COPYRIGHT; + + i_ret = ioctl( i_fd, SIOC_IO, &sctl_io ); + + *pi_copyright = p_buffer[ 4 ]; + #elif defined( SOLARIS_USCSI ) INIT_USCSI( GPCMD_READ_DVD_STRUCTURE, 8 ); @@ -290,6 +311,21 @@ int ioctl_ReadDiscKey( int i_fd, int *pi_agid, u8 *p_key ) memcpy( p_key, p_buffer + 4, 2048 ); +#elif defined( HPUX_SCTL_IO ) + INIT_SCTL_IO( GPCMD_READ_DVD_STRUCTURE, 2048 + 4 ); + + sctl_io.cdb[ 7 ] = DVD_STRUCT_DISCKEY; + sctl_io.cdb[ 10 ] = *pi_agid << 6; + + i_ret = ioctl( i_fd, SIOC_IO, &sctl_io ); + + if( i_ret < 0 ) + { + return i_ret; + } + + memcpy( p_key, p_buffer + 4, 2048 ); + #elif defined( SOLARIS_USCSI ) INIT_USCSI( GPCMD_READ_DVD_STRUCTURE, 2048 + 4 ); @@ -405,6 +441,9 @@ int ioctl_ReadTitleKey( int i_fd, int *pi_agid, int i_pos, u8 *p_key ) #elif defined( SYS_BEOS ) i_ret = -1; +#elif defined( HPUX_SCTL_IO ) + i_ret = -1; + #elif defined( SOLARIS_USCSI ) i_ret = -1; @@ -479,6 +518,15 @@ int ioctl_ReportAgid( int i_fd, int *pi_agid ) *pi_agid = p_buffer[ 7 ] >> 6; +#elif defined( HPUX_SCTL_IO ) + INIT_SCTL_IO( GPCMD_REPORT_KEY, 8 ); + + sctl_io.cdb[ 10 ] = DVD_REPORT_AGID | (*pi_agid << 6); + + i_ret = ioctl( i_fd, SIOC_IO, &sctl_io ); + + *pi_agid = p_buffer[ 7 ] >> 6; + #elif defined( SOLARIS_USCSI ) INIT_USCSI( GPCMD_REPORT_KEY, 8 ); @@ -580,6 +628,15 @@ int ioctl_ReportChallenge( int i_fd, int *pi_agid, u8 *p_challenge ) memcpy( p_challenge, p_buffer + 4, 12 ); +#elif defined( HPUX_SCTL_IO ) + INIT_SCTL_IO( GPCMD_REPORT_KEY, 16 ); + + sctl_io.cdb[ 10 ] = DVD_REPORT_CHALLENGE | (*pi_agid << 6); + + i_ret = ioctl( i_fd, SIOC_IO, &sctl_io ); + + memcpy( p_challenge, p_buffer + 4, 12 ); + #elif defined( SOLARIS_USCSI ) INIT_USCSI( GPCMD_REPORT_KEY, 16 ); @@ -694,6 +751,15 @@ int ioctl_ReportASF( int i_fd, int *pi_agid, int *pi_asf ) *pi_asf = p_buffer[ 7 ] & 1; +#elif defined( HPUX_SCTL_IO ) + INIT_SCTL_IO( GPCMD_REPORT_KEY, 8 ); + + sctl_io.cdb[ 10 ] = DVD_REPORT_ASF | (*pi_agid << 6); + + i_ret = ioctl( i_fd, SIOC_IO, &sctl_io ); + + *pi_asf = p_buffer[ 7 ] & 1; + #elif defined( SOLARIS_USCSI ) INIT_USCSI( GPCMD_REPORT_KEY, 8 ); @@ -809,6 +875,15 @@ int ioctl_ReportKey1( int i_fd, int *pi_agid, u8 *p_key ) memcpy( p_key, p_buffer + 4, 8 ); +#elif defined( HPUX_SCTL_IO ) + INIT_SCTL_IO( GPCMD_REPORT_KEY, 12 ); + + sctl_io.cdb[ 10 ] = DVD_REPORT_KEY1 | (*pi_agid << 6); + + i_ret = ioctl( i_fd, SIOC_IO, &sctl_io ); + + memcpy( p_key, p_buffer + 4, 8 ); + #elif defined( SOLARIS_USCSI ) INIT_USCSI( GPCMD_REPORT_KEY, 12 ); @@ -914,6 +989,13 @@ int ioctl_InvalidateAgid( int i_fd, int *pi_agid ) i_ret = ioctl( i_fd, B_RAW_DEVICE_COMMAND, &rdc, sizeof(rdc) ); +#elif defined( HPUX_SCTL_IO ) + INIT_SCTL_IO( GPCMD_REPORT_KEY, 0 ); + + sctl_io.cdb[ 10 ] = DVD_INVALIDATE_AGID | (*pi_agid << 6); + + i_ret = ioctl( i_fd, SIOC_IO, &sctl_io ); + #elif defined( SOLARIS_USCSI ) INIT_USCSI( GPCMD_REPORT_KEY, 0 ); @@ -1016,6 +1098,16 @@ int ioctl_SendChallenge( int i_fd, int *pi_agid, u8 *p_challenge ) return ioctl( i_fd, B_RAW_DEVICE_COMMAND, &rdc, sizeof(rdc) ); +#elif defined( HPUX_SCTL_IO ) + INIT_SCTL_IO( GPCMD_SEND_KEY, 16 ); + + sctl_io.cdb[ 10 ] = DVD_SEND_CHALLENGE | (*pi_agid << 6); + + p_buffer[ 1 ] = 0xe; + memcpy( p_buffer + 4, p_challenge, 12 ); + + return ioctl( i_fd, SIOC_IO, &sctl_io ); + #elif defined( SOLARIS_USCSI ) INIT_USCSI( GPCMD_SEND_KEY, 16 ); @@ -1126,6 +1218,16 @@ int ioctl_SendKey2( int i_fd, int *pi_agid, u8 *p_key ) return ioctl( i_fd, B_RAW_DEVICE_COMMAND, &rdc, sizeof(rdc) ); +#elif defined( HPUX_SCTL_IO ) + INIT_SCTL_IO( GPCMD_SEND_KEY, 12 ); + + sctl_io.cdb[ 10 ] = DVD_SEND_KEY2 | (*pi_agid << 6); + + p_buffer[ 1 ] = 0xa; + memcpy( p_buffer + 4, p_key, 8 ); + + return ioctl( i_fd, SIOC_IO, &sctl_io ); + #elif defined( SOLARIS_USCSI ) INIT_USCSI( GPCMD_SEND_KEY, 12 ); @@ -1237,6 +1339,39 @@ static void BeInitRDC( raw_device_command *p_rdc, int i_type ) } #endif +#if defined( HPUX_SCTL_IO ) +/***************************************************************************** + * HPUXInitSCTL: initialize a sctl_io structure for the HP-UX kernel + ***************************************************************************** + * This function initializes a HP-UX command structure for future + * use, either a read command or a write command. + *****************************************************************************/ +static void HPUXInitSCTL( struct sctl_io *sctl_io, int i_type ) +{ + memset( sctl_io->data, 0, sctl_io->data_length ); + + switch( i_type ) + { + case GPCMD_SEND_KEY: + /* leave the flags to 0 */ + break; + + case GPCMD_READ_DVD_STRUCTURE: + case GPCMD_REPORT_KEY: + sctl_io->flags = SCTL_READ; + break; + } + + sctl_io->cdb[ 0 ] = i_type; + + sctl_io->cdb[ 8 ] = (sctl_io->data_length >> 8) & 0xff; + sctl_io->cdb[ 9 ] = sctl_io->data_length & 0xff; + sctl_io->cdb_length = 12; + + sctl_io->max_msecs = 1000000; +} +#endif + #if defined( SOLARIS_USCSI ) /***************************************************************************** * SolarisInitUSCSI: initialize a USCSICMD structure for the Solaris kernel diff --git a/extras/libdvdcss/ioctl.h b/extras/libdvdcss/ioctl.h index e532d4c94a..b23396fb02 100644 --- a/extras/libdvdcss/ioctl.h +++ b/extras/libdvdcss/ioctl.h @@ -2,7 +2,7 @@ * ioctl.h: DVD ioctl replacement function ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN - * $Id: ioctl.h,v 1.9 2001/11/25 22:52:21 gbazin Exp $ + * $Id: ioctl.h,v 1.10 2001/12/11 14:43:38 sam Exp $ * * Authors: Samuel Hocevar * @@ -45,6 +45,19 @@ int ioctl_SendKey2 ( int, int *, u8 * ); BeInitRDC( &rdc, (TYPE) ); #endif +/***************************************************************************** + * Common macro, HP-UX specific + *****************************************************************************/ +#if defined( HPUX_SCTL_IO ) +#define INIT_SCTL_IO( TYPE, SIZE ) \ + struct sctl_io sctl_io; \ + u8 p_buffer[ (SIZE) ]; \ + memset( &sctl_io, 0, sizeof( sctl_io ) ); \ + sctl_io.data = (void *)p_buffer; \ + sctl_io.data_length = (SIZE); \ + HPUXInitSCTL( &sctl_io, (TYPE) ); +#endif + /***************************************************************************** * Common macro, Solaris specific *****************************************************************************/ @@ -92,7 +105,7 @@ int ioctl_SendKey2 ( int, int *, u8 * ); * Various DVD I/O tables *****************************************************************************/ -#if defined( SYS_BEOS ) || defined( WIN32 ) || defined ( SOLARIS_USCSI ) +#if defined( SYS_BEOS ) || defined( WIN32 ) || defined ( SOLARIS_USCSI ) || defined ( HPUX_SCTL_IO ) /* The generic packet command opcodes for CD/DVD Logical Units, * From Table 57 of the SFF8090 Ver. 3 (Mt. Fuji) draft standard. */ # define GPCMD_READ_DVD_STRUCTURE 0xad diff --git a/include/defs.h.in b/include/defs.h.in index 21b173d3e3..e97dcbefeb 100644 --- a/include/defs.h.in +++ b/include/defs.h.in @@ -383,6 +383,9 @@ /* Have userspace SCSI headers. */ #undef SOLARIS_USCSI +/* Define if defines sctl_io. */ +#undef HPUX_SCTL_IO + /* Define if Linux-like dvd_struct is defined. */ #undef HAVE_LINUX_DVD_STRUCT -- 2.39.2