Projects
Essentials
libdvdcss2
Sign Up
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 9
View file
libdvdcss2.changes
Changed
@@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Feb 22 11:46:02 UTC 2017 - scarabeus@opensuse.org + +- Version update to 1.4.0: + * Various smal tweaks +- Spec cleanup + +------------------------------------------------------------------- Thu Mar 5 07:25:43 UTC 2015 - aloisio@gmx.com - Update to 1.3.0:
View file
libdvdcss2.spec
Changed
@@ -1,71 +1,44 @@ # vim: set sw=4 ts=4 et: +# +# spec file for package libdvdcss2 +# +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + Name: libdvdcss2 -Summary: Library for accessing DVDs like block device usind deCSS if needed -Summary(de): Bibliothek zum Zugriff auf DVDs mit deCSS-Entschlüsselung, falls benötigt -Summary(fi): DVD-aseman käsittelyyn tarkoitettu ohjelmointikirjasto -Version: 1.3.0 +Version: 1.4.0 Release: 0 +Summary: Library for accessing DVDs like block device usind deCSS if needed License: GPL-2.0+ -URL: http://www.videolan.org/libdvdcss/ Group: System/Libraries -Source0: libdvdcss-%{version}.tar.bz2 -NoSource: 0 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Conflicts: libdvdcss0.0.1, libdvdcss0.0.2 -Provides: libdvdcss = %{version}-%{release} -BuildRequires: pkgconfig -BuildRequires: glibc-devel +Url: http://www.videolan.org/libdvdcss/ +Source0: http://download.videolan.org/pub/libdvdcss/%{version}/libdvdcss-%{version}.tar.bz2 BuildRequires: gcc -BuildRequires: gcc-fortran +BuildRequires: pkgconfig +Provides: libdvdcss = %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description libdvdcss is a simple library designed for accessing DVDs like a block device -without having to bother about the decryption. The important features are: - * Portability. Currently supported platforms are GNU/Linux, FreeBSD, NetBSD, - OpenBSD, BSD/OS, BeOS, Windows 95/98, Windows NT/2000, MacOS X, Solaris, - and HP-UX. - * Simplicity. There are currently 7 functions in the API, and we intend to - keep this number low. - * Freedom. libdvdcss is released under the General Public License, ensuring - it will stay free, and used only for free software products. - * Just better. Unlike most similar projects, libdvdcss doesn't require the - region of your drive to be set. - -%description -l de -Die libdvdcss ist eine einfache Bibliothek, entwickelt um auf DVDs wie auf -Blockdevices zuzugreifen, ohne sich über die Verschlüsselung gedanken machen -zu mpssen. Die wichtigsten Features sind: - * Portabilität. Augenblicklich werden folgende Plattformen unterstützt: - GNU/Linux, FreeBSD, NetBSD, OpenBSD, BSD/OS, BeOS, Windows 95/98, Windows - NT/2000, MacOS X, Solaris und HP-UX. - * Einfachheit. Es gibt augenblicklich 7 Funktionen in der API und die - Entwickler sind bestrebt, die Zahl niedrig zu halten. - * Freiheit. Die libdvdcss steht unter der General Public License, demzufolge - wird es frei bleiben und nur für freie Softwareprojekte eingesetzt. - * Einfach besser. Im Gegensatz zu anderen Projekten dieser art benötigt - libdvdcss den Region-Code des DVD-Laufwerks nicht. - -%description -l fi -libdvdcss on yksinkertainen ohjelmointikirjasto, jonka tarkoitus on tarjota -DVD-aseman käsittelyyn helppo rajanpinta. libdvdcss käyttäjän ei tarvitse myöskään -välittää CSS:stä vaan libdvdcss hoitaa sen automaattisesti. -Tärkeimmät ominaisuudet ovat: - * Koodin siirrettävyys eri käyttöjärjestelmien välillä. - Tuettuja tällä hetkellä: - OpenBSD, BSD/OS, BeOS, Windows 95/98, Windows NT/2000, MacOS X, Solaris, - ja HP-UX. - * Helppous. Kirjastossa on vain 7 funktiota ohjelmointirajapinnassa. - * Vapaus. Koodi on julkaistu General Public Lisenssin alaisena - * Toisin kuin monet DVD-purkukirjastot libdvdcss ei tarvitse aluekoodia +without having to bother about the decryption. %package -n libdvdcss-devel Summary: Development tools for programs which will use the libdvdcss library -Summary(de): Entwicklungstools für Programme die die libdvdcss Bibliothek nutzen -Summary(fi): DVD-soittimen käsittelyyn tarkoitettu ohjelmointi kirjasto Group: Development/Libraries/C and C++ -Requires: %{name} = %version-%release -Provides: %{name}devel = %version-%release +Requires: %{name} = %{version}-%{release} +Provides: %{name}devel = %{version}-%{release} %description -n libdvdcss-devel The libdvdcss-devel package includes the header files and static libraries @@ -73,33 +46,19 @@ the libdvdcss library. If you are going to develop programs which will manipulate DVDs, you -should install libdvdcss-devel. You'll also need to have the libdvdcss -package installed. - -%description -n libdvdcss-devel -l de -Das libdvdcss-devel Packet enthelt Header-Files und statisch gelinkte -Bibliotheken die zur Entwicklung eigener Programme benötigt werden, die -auf DVDs mit Hilfe der libdvdcss zugreifen wollen. - -Wenn Sie Programme entwicklen wollen, die auf DVDs zugreifen sollen, -sollten sie libdvdcss-devel installieren. Es wird ebenso die libdvdcss -benötigt. - -%description -n libdvdcss-devel -l fi -Paketti sisältää header-tiedostot sekä staattiset kirjastot, jotka ovat -tarpeellisia ohjelmien kehittämisen kannalta. -Jos aiot kehittää ohjelman joka käyttää libdvdcss sinun tulee asentaa nämä -tiedostot. +should install libdvdcss-devel. %prep %setup -q -n libdvdcss-%{version} %build -%configure --disable-static +%configure \ + --disable-static \ + --disable-silent-rules make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install find %{buildroot} -type f -name "*.la" -delete -print rm -rf %{buildroot}%{_datadir}/doc/
View file
libdvdcss-1.3.0.tar.bz2/doc/footer.html
Deleted
@@ -1,2 +0,0 @@ - </body> -</html>
View file
libdvdcss-1.3.0.tar.bz2/doc/header.html
Deleted
@@ -1,9 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<html> - <head> - <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"> - <title>libdvdcss documentation</title> - <link href="/main.css" rel="stylesheet" type="text/css"> - <link href="/doxygen.css" rel="stylesheet" type="text/css"> - </head> - <body>
View file
libdvdcss-1.3.0.tar.bz2/COPYING -> libdvdcss-1.4.0.tar.bz2/COPYING
Changed
@@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -56,7 +56,7 @@ The precise terms and conditions for copying, distribution and modification follow.  - GNU GENERAL PUBLIC LICENSE + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -255,7 +255,7 @@ of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -277,9 +277,9 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS + END OF TERMS AND CONDITIONS  - How to Apply These Terms to Your New Programs + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it
View file
libdvdcss-1.3.0.tar.bz2/ChangeLog -> libdvdcss-1.4.0.tar.bz2/ChangeLog
Changed
@@ -1,3 +1,1023 @@ +commit a34ebf642b10e47c80829b923aff120d70184aba +Author: Jean-Baptiste Kempf <jb@videolan.org> +Date: Wed Dec 16 16:01:56 2015 +0100 + + Update NEWS for 1.4.0 + +commit a7e814e3bfc6b7b8507c0e1083153611edb66748 +Author: Petri Hintukainen <phintuka@gmail.com> +Date: Wed Dec 16 11:21:42 2015 +0200 + + generate version.h + +commit 417a9cb24ea0658cdb76ae28e9f86dc2347ee1d5 +Author: Petri Hintukainen <phintuka@gmail.com> +Date: Thu Jul 16 10:57:57 2015 +0300 + + Fix leak + +commit 50a9209451c63397a2aaccf9a3ae11ae29d3d707 +Author: Romain Bentz <bentz.romain@gmail.com> +Date: Tue Oct 27 18:17:09 2015 +0100 + + Fix CSS key caching on Android + + Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org> + +commit 3a322908f40dd16df76e2bfb9516eb052dc7933c +Author: Hannes Domani <ssbssa@yahoo.de> +Date: Fri Jul 24 17:15:39 2015 +0200 + + Always initialize readv temporary buffer. + + Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org> + +commit 41905a9b3581a0efe7ecc73d39f7820601d16ff3 +Author: Ludovic Fauvet <etix@videolan.org> +Date: Fri Apr 10 17:15:48 2015 +0200 + + Fix build on win32 + + Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org> + +commit 70260b04bf37880bb928306f6f7ee607ce531395 +Author: Petri Hintukainen <phintuka@gmail.com> +Date: Sun Mar 29 22:21:52 2015 +0300 + + Avoid closing random file descriptor + + Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org> + +commit bf669a831a7bc841621dc8117c18422b55656512 +Author: Sam Varshavchik <mrsam@courier-mta.com> +Date: Sat Feb 14 12:18:22 2015 -0500 + + Tweak the rpm spec file + + Have make clean remove libdvdcss.spec that autoconf creates from + libdvdcss.spec.in + + Include %{?dist} tag into the RPM release tag, this a convention with + most RPM-based distributions. + + The rpm packages were missing a few files. + + Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org> + +commit ec7c3a567dda8afd1516b49d33672557f981eb51 +Author: Thomas Guillem <thomas@gllm.fr> +Date: Wed Jan 28 16:29:40 2015 +0100 + + dvdcss_open_stream: cast to off_t + + Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org> + +commit cce6baf1edf30fd39650eea94e752f5be515feb9 +Author: Thomas Guillem <thomas@gllm.fr> +Date: Wed Jan 28 16:29:39 2015 +0100 + + dvdcss_open_stream: fix SEGFAULT due to a NULL psz_target + + Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org> + +commit 4863c1ea386041bbf244f4d0a41aea063a810a2a +Author: Jean-Baptiste Kempf <jb@videolan.org> +Date: Wed Jan 28 15:06:50 2015 +0100 + + Prepare a test release 1.3.99 + +commit c86f8cd26d1c4fb9d9a356b5bb4f5c65ca66b90d +Author: Jean-Baptiste Kempf <jb@videolan.org> +Date: Tue Jan 27 16:15:16 2015 +0100 + + Increase .so value, because of new API + +commit 781e998132501c8d12c9ee95eb3ab6b6d289327f +Author: Jean-Baptiste Kempf <jb@videolan.org> +Date: Tue Jan 27 16:14:40 2015 +0100 + + libtool -version-info takes current[:revision[:age]] + + Not current[:age[:revision]] + +commit 50d5296d42cffcc60b9244af3aa672c5151e31cb +Author: Jean-Baptiste Kempf <jb@videolan.org> +Date: Tue Jan 27 16:06:50 2015 +0100 + + On the road to 1.4.0 + +commit f72b87294908e6fd28c79558bb7519e0bef1a3c9 +Author: Thomas Guillem <tom@gllm.fr> +Date: Tue Jan 27 15:54:44 2015 +0100 + + Add dvdcss_open_stream() API function + + This allows opening a DVD device using external read/seek callbacks. + + Signed-off-by: Diego Biurrun <diego@biurrun.de> + Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org> + +commit 2ce12e9e2b52955c20804845840d2239fe279674 +Author: Evgeny Grin <karlson2k@kodi.tv> +Date: Tue Jan 27 15:39:10 2015 +0100 + + Fix position after partial read in libc_read + + Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org> + +commit b8171911daa0908ebda3a7868a16f9e70fa375f3 +Author: Jean-Baptiste Kempf <jb@videolan.org> +Date: Tue Jan 27 15:15:20 2015 +0100 + + Revert "device: Adjust types in offset calculations" + + This reverts commit c500fe5227012ac04ec0b91c6c29606bad246839. + +commit 5002be6b4d4390be21aa67e82ee9e20298692712 +Author: Jean-Baptiste Kempf <jb@videolan.org> +Date: Tue Jan 27 15:08:37 2015 +0100 + + Revert "win32: Use proper handle instead of file descriptor to access devices" + + This reverts commit 1b4e3f9e1c4e7b53cce59b802f95f6400ba641dd. + +commit d1f3068297b729d38d15a9b4732409f250e9d763 +Author: Diego Biurrun <diego@biurrun.de> +Date: Sat Nov 29 17:02:54 2014 +0100 + + Replace check for WIN32 define with check for _WIN32 define. + + The former is deprecated, the latter should be used nowadays. + +commit 6ea4a6589a96aa90cc7e1e3968f28fd5e40e4b93 +Author: Diego Biurrun <diego@biurrun.de> +Date: Sat Nov 29 17:02:10 2014 +0100 + + build: Fix typo in config.h define comment + +commit 8894cb46629c1ccb7a87693a4d6eaea1cef543cf +Author: Diego Biurrun <diego@biurrun.de> +Date: Sat Nov 29 16:05:00 2014 +0100 + + build: Support building under msys2 + +commit 497b8b6e549c1465945856747a0f589140a26307 +Author: Diego Biurrun <diego@biurrun.de> +Date: Sat Nov 29 16:04:05 2014 +0100 + + build: Fix wince/mingwce detection + +commit 1c2da8e3818b07036ea5931ab7e6e6033e50e1da +Author: Diego Biurrun <diego@biurrun.de> +Date: Tue Nov 18 18:29:36 2014 +0100 + + ioctl: Simplify win32 version of ioctl_ReportAgid() + +commit bb6e3da30118fd64df791a60f25ac54cf7937b25 +Author: Diego Biurrun <diego@biurrun.de> +Date: Tue Nov 18 11:54:00 2014 +0100 + + css: Restructure control flow of win32 bits in dvdcss_test() + + Avoid checking an impossible condition, skip the check instead. + This fixes CID 82126. + +commit e206559af30267cc1b893c5f177c2ff0ac708445 +Author: Diego Biurrun <diego@biurrun.de> +Date: Mon Nov 17 21:59:38 2014 +0100 + + Remove some commented-out cruft and pointless debug output. + +commit 41dc1176c4590bb2047b614547fa230838f2c335 +Author: Diego Biurrun <diego@biurrun.de> +Date: Sun Nov 16 22:40:27 2014 +0100 + + ioctl: Drop single-use INIT_SPTD/SEND_SPTD macros + +commit 00abe6bb8626e950f64df2f28b899c4d793b278a +Author: Diego Biurrun <diego@biurrun.de> +Date: Mon Nov 17 21:08:32 2014 +0100
View file
libdvdcss-1.3.0.tar.bz2/Makefile.am -> libdvdcss-1.4.0.tar.bz2/Makefile.am
Changed
@@ -1,19 +1,22 @@ ACLOCAL_AMFLAGS = -I m4 +AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src/dvdcss -EXTRA_DIST = msvc libdvdcss.spec doc/header.html doc/footer.html INSTALL +EXTRA_DIST = msvc libdvdcss.spec INSTALL dist_doc_DATA = AUTHORS COPYING NEWS README ChangeLog MAINTAINERCLEANFILES = ChangeLog ChangeLog: $(wildcard $(srcdir)/.git/logs/HEAD) +if GIT -cd $(srcdir) && git log > $(abs_builddir)/$(@)-tmp test -s $(@)-tmp && mv $(@)-tmp $(@) -rm -f $(@)-tmp +endif test -e $(@) || touch $(@) lib_LTLIBRARIES = libdvdcss.la -EXTRA_PROGRAMS = csstest dvd_region +EXTRA_PROGRAMS = test/csstest test/dvd_region libdvdcss_la_SOURCES = \ src/libdvdcss.c \ @@ -35,16 +38,18 @@ libdvdcss_la_LDFLAGS += -no-undefined endif -csstest_SOURCES = test/csstest.c -csstest_LDADD = libdvdcss.la -csstest_CFLAGS = -I $(top_srcdir)/src +test_csstest_SOURCES = test/csstest.c +test_csstest_LDADD = libdvdcss.la +test_csstest_CFLAGS = -I $(top_srcdir)/src -dvd_region_SOURCES = test/dvd_region.c src/ioctl.c -dvd_region_LDADD = libdvdcss.la -dvd_region_CFLAGS = -I $(top_srcdir)/src +test_dvd_region_SOURCES = test/dvd_region.c +test_dvd_region_LDADD = libdvdcss.la +test_dvd_region_CFLAGS = -I $(top_srcdir)/src pkgincludedir = $(includedir)/dvdcss -pkginclude_HEADERS = src/dvdcss/dvdcss.h +pkginclude_HEADERS = \ + src/dvdcss/dvdcss.h \ + src/dvdcss/version.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = src/libdvdcss.pc @@ -57,12 +62,14 @@ apidoc: stamp-doxygen -stamp-doxygen: doc/doxygen.cfg - cd doc && doxygen doxygen.cfg +stamp-doxygen: doc/doxygen.cfg src/libdvdcss.c src/dvdcss/dvdcss.h + doxygen $< touch $@ +tools: test/csstest$(EXEEXT) test/dvd_region$(EXEEXT) + clean-local: - -rm -Rf stamp-doxygen doc/html + -rm -Rf stamp-doxygen doc/doxygen_sqlite3.db libdvdcss.spec doc/html install-apidoc: $(MKDIR_P) $(DESTDIR)$(htmldir) @@ -72,3 +79,5 @@ uninstall-apidoc: -rm -Rf $(DESTDIR)$(htmldir)/*.png $(DESTDIR)$(htmldir)/*.html $(DESTDIR)$(htmldir)/*.css $(DESTDIR)$(htmldir)/*.js + +.PHONY: apidoc tools
View file
libdvdcss-1.3.0.tar.bz2/Makefile.in -> libdvdcss-1.4.0.tar.bz2/Makefile.in
Changed
@@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -17,7 +17,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,16 +89,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -EXTRA_PROGRAMS = csstest$(EXEEXT) dvd_region$(EXEEXT) +EXTRA_PROGRAMS = test/csstest$(EXEEXT) test/dvd_region$(EXEEXT) @SYS_MSVC_FALSE@am__append_1 = -no-undefined subdir = . -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in $(top_srcdir)/doc/doxygen.cfg.in \ - $(top_srcdir)/src/libdvdcss.pc.in depcomp $(dist_doc_DATA) \ - $(pkginclude_HEADERS) AUTHORS COPYING ChangeLog INSTALL NEWS \ - README compile config.guess config.sub install-sh missing \ - ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -96,11 +99,15 @@ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(dist_doc_DATA) $(pkginclude_HEADERS) \ + $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = doc/doxygen.cfg src/libdvdcss.pc +CONFIG_CLEAN_FILES = libdvdcss.spec doc/doxygen.cfg src/libdvdcss.pc \ + src/dvdcss/version.h CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -144,19 +151,20 @@ libdvdcss_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libdvdcss_la_LDFLAGS) $(LDFLAGS) -o $@ -am_csstest_OBJECTS = test/csstest-csstest.$(OBJEXT) -csstest_OBJECTS = $(am_csstest_OBJECTS) -csstest_DEPENDENCIES = libdvdcss.la -csstest_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(csstest_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -am_dvd_region_OBJECTS = test/dvd_region-dvd_region.$(OBJEXT) \ - src/dvd_region-ioctl.$(OBJEXT) -dvd_region_OBJECTS = $(am_dvd_region_OBJECTS) -dvd_region_DEPENDENCIES = libdvdcss.la -dvd_region_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(dvd_region_CFLAGS) \ +am_test_csstest_OBJECTS = test/test_csstest-csstest.$(OBJEXT) +test_csstest_OBJECTS = $(am_test_csstest_OBJECTS) +test_csstest_DEPENDENCIES = libdvdcss.la +test_csstest_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_csstest_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +am_test_dvd_region_OBJECTS = \ + test/test_dvd_region-dvd_region.$(OBJEXT) +test_dvd_region_OBJECTS = $(am_test_dvd_region_OBJECTS) +test_dvd_region_DEPENDENCIES = libdvdcss.la +test_dvd_region_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(test_dvd_region_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ + -o $@ AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -191,10 +199,10 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(libdvdcss_la_SOURCES) $(csstest_SOURCES) \ - $(dvd_region_SOURCES) -DIST_SOURCES = $(libdvdcss_la_SOURCES) $(csstest_SOURCES) \ - $(dvd_region_SOURCES) +SOURCES = $(libdvdcss_la_SOURCES) $(test_csstest_SOURCES) \ + $(test_dvd_region_SOURCES) +DIST_SOURCES = $(libdvdcss_la_SOURCES) $(test_csstest_SOURCES) \ + $(test_dvd_region_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -224,6 +232,12 @@ CTAGS = ctags CSCOPE = cscope AM_RECURSIVE_TARGETS = cscope +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(srcdir)/libdvdcss.spec.in $(top_srcdir)/doc/doxygen.cfg.in \ + $(top_srcdir)/src/dvdcss/version.h.in \ + $(top_srcdir)/src/libdvdcss.pc.in AUTHORS COPYING ChangeLog \ + INSTALL NEWS README compile config.guess config.sub depcomp \ + install-sh ltmain.sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -265,12 +279,16 @@ DUMPBIN = @DUMPBIN@ DVDCSS_LDFLAGS = @DVDCSS_LDFLAGS@ DVDCSS_LTVERSION = @DVDCSS_LTVERSION@ +DVDCSS_VERSION_MAJOR = @DVDCSS_VERSION_MAJOR@ +DVDCSS_VERSION_MICRO = @DVDCSS_VERSION_MICRO@ +DVDCSS_VERSION_MINOR = @DVDCSS_VERSION_MINOR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GIT = @GIT@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -285,6 +303,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -353,6 +372,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -362,7 +382,8 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST = msvc libdvdcss.spec doc/header.html doc/footer.html INSTALL +AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src/dvdcss +EXTRA_DIST = msvc libdvdcss.spec INSTALL dist_doc_DATA = AUTHORS COPYING NEWS README ChangeLog MAINTAINERCLEANFILES = ChangeLog lib_LTLIBRARIES = libdvdcss.la @@ -382,13 +403,16 @@ libdvdcss_la_LDFLAGS = -version-info $(DVDCSS_LTVERSION) \ $(DVDCSS_LDFLAGS) $(am__append_1) libdvdcss_la_LIBADD = -csstest_SOURCES = test/csstest.c -csstest_LDADD = libdvdcss.la -csstest_CFLAGS = -I $(top_srcdir)/src -dvd_region_SOURCES = test/dvd_region.c src/ioctl.c -dvd_region_LDADD = libdvdcss.la -dvd_region_CFLAGS = -I $(top_srcdir)/src -pkginclude_HEADERS = src/dvdcss/dvdcss.h +test_csstest_SOURCES = test/csstest.c +test_csstest_LDADD = libdvdcss.la +test_csstest_CFLAGS = -I $(top_srcdir)/src +test_dvd_region_SOURCES = test/dvd_region.c +test_dvd_region_LDADD = libdvdcss.la +test_dvd_region_CFLAGS = -I $(top_srcdir)/src +pkginclude_HEADERS = \ + src/dvdcss/dvdcss.h \ + src/dvdcss/version.h + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = src/libdvdcss.pc all: config.h @@ -411,7 +435,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \
View file
libdvdcss-1.3.0.tar.bz2/NEWS -> libdvdcss-1.4.0.tar.bz2/NEWS
Changed
@@ -1,3 +1,24 @@ +Changes between 1.3.99 and 1.4.0: +--------------------------------- + * Add key caching on Android + * Fix leaks, win32 build breakage, file descriptor initialization + * Expose version.h + + +Changes between 1.3.0 and 1.3.99: +--------------------------------- + * Drop support for HP-UX. + * Drop support for Windows 9x and Windows NT. + Windows 2000 is now required. + * Replace BeOS support by Haiku support. + * Add dvdcss_open_stream() to public API. This allows installing custom + callback functions for accessing DVD, e.g. over the network. + * dvdcss_error() now returns "const char *" instad of "char *". + * Drop support for MSVC versions before 2010. + * Raw device access now errors out if the device cannot be opened. + * Miscellaneous cleanups to code, documentation, build system. + + Changes between 1.2.13 and 1.3.0: --------------------------------- @@ -146,4 +167,3 @@ * internal key cache mechanism * stability fixes -
View file
libdvdcss-1.3.0.tar.bz2/README -> libdvdcss-1.4.0.tar.bz2/README
Changed
@@ -14,6 +14,7 @@ See the INSTALL file. + Running libdvdcss ================= @@ -41,7 +42,7 @@ =============== A mailing-list has been set up for support and discussion about -libdvdcss. Its address is : +libdvdcss. Its address is: <libdvdcss-devel@videolan.org> @@ -59,4 +60,3 @@ The VideoLAN web site at http://www.videolan.org/ is a good start for information about MPEG and DVD playback. Have a look at the support section to look for answers. -
View file
libdvdcss-1.3.0.tar.bz2/aclocal.m4 -> libdvdcss-1.4.0.tar.bz2/aclocal.m4
Changed
@@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.14.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15 -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,7 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -32,10 +32,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.14' +[am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.14.1], [], +m4_if([$1], [1.15], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,14 +51,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.14.1])dnl +[AM_AUTOMAKE_VERSION([1.15])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -103,15 +103,14 @@ # configured tree to be moved without reconfiguration. AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` ]) # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -142,7 +141,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -333,7 +332,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -409,7 +408,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -499,8 +498,8 @@ # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl @@ -573,7 +572,11 @@ END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi -fi]) +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. +]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -602,7 +605,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -613,7 +616,7 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -623,7 +626,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -645,7 +648,7 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -680,7 +683,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -730,7 +733,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -769,7 +772,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -798,7 +801,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -845,7 +848,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it,
View file
libdvdcss-1.3.0.tar.bz2/compile -> libdvdcss-1.4.0.tar.bz2/compile
Changed
@@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey <tromey@cygnus.com>. # # This program is free software; you can redistribute it and/or modify
View file
libdvdcss-1.3.0.tar.bz2/config.guess -> libdvdcss-1.4.0.tar.bz2/config.guess
Changed
@@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2013-06-10' +timestamp='2014-11-04' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -24,12 +24,12 @@ # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # -# Originally written by Per Bothner. +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD # -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to <config-patches@gnu.org>. me=`echo "$0" | sed -e 's,.*/,,'` @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -149,7 +149,7 @@ LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` ;; esac @@ -579,8 +579,9 @@ else IBM_ARCH=powerpc fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` + if [ -x /usr/bin/lslpp ] ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi @@ -826,7 +827,7 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS*:*) + *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -969,10 +970,10 @@ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - or1k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + openrisc*:Linux:*:*) + echo or1k-unknown-linux-${LIBC} exit ;; - or32:Linux:*:*) + or32:Linux:*:* | or1k*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) @@ -1260,16 +1261,26 @@ if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; @@ -1361,154 +1372,6 @@ exit ;; esac -eval $set_cc_for_build -cat >$dummy.c <<EOF -#ifdef _SEQUENT_ -# include <sys/types.h> -# include <sys/utsname.h> -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include <sys/param.h> - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0);
View file
libdvdcss-1.3.0.tar.bz2/config.h.in -> libdvdcss-1.4.0.tar.bz2/config.h.in
Changed
@@ -36,9 +36,6 @@ /* Define to 1 if you have the <io.h> header file. */ #undef HAVE_IO_H -/* Define to 1 if you have the <limits.h> header file. */ -#undef HAVE_LIMITS_H - /* Define to 1 if you have the <linux/cdrom.h> header file. */ #undef HAVE_LINUX_CDROM_H @@ -102,11 +99,7 @@ /* Define to 1 if you have the <winioctl.h> header file. */ #undef HAVE_WINIOCTL_H -/* Define if <sys/scsi.h> defines sctl_io. */ -#undef HPUX_SCTL_IO - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR /* Define O_BINARY if missing */ @@ -139,9 +132,8 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS -/* Define this if the compiler supports __attribute__(( - ifelse([visibility("default")], , [visibility_default], - [visibility("default")]) )) */ +/* Define this if the compiler supports __attribute__((visibility("default"))) + */ #undef SUPPORT_ATTRIBUTE_VISIBILITY_DEFAULT /* Define this if the compiler supports the -fvisibility flag */ @@ -161,7 +153,7 @@ /* Define for large files, on AIX-style hosts. */ #undef _LARGE_FILES -/* Define to '0x0500' for IE 5.0 (and shell) APIs. */ +/* Define to '0x0501' for IE 5.01 (and shell) APIs. */ #undef _WIN32_IE /* Define to empty if `const' does not conform to ANSI C. */
View file
libdvdcss-1.3.0.tar.bz2/config.sub -> libdvdcss-1.4.0.tar.bz2/config.sub
Changed
@@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2013-04-24' +timestamp='2014-12-03' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ # of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to <config-patches@gnu.org>. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -68,7 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -257,7 +257,7 @@ | avr | avr32 \ | be32 | be64 \ | bfin \ - | c4x | clipper \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ | epiphany \ | fido | fr30 | frv \ @@ -265,6 +265,7 @@ | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | k1om \ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ @@ -282,8 +283,10 @@ | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipsr5900 | mipsr5900el \ @@ -295,11 +298,11 @@ | nds32 | nds32le | nds32be \ | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | open8 \ - | or1k | or32 \ + | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ + | riscv32 | riscv64 \ | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ @@ -310,6 +313,7 @@ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -324,7 +328,10 @@ c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + leon|leon[3-9]) + basic_machine=sparc-$basic_machine + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -372,7 +379,7 @@ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -381,6 +388,7 @@ | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | k1om-* \ | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ @@ -400,8 +408,10 @@ | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipsr5900-* | mipsr5900el-* \ @@ -413,6 +423,7 @@ | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ + | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ @@ -430,6 +441,7 @@ | ubicom32-* \ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ + | visium-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -767,6 +779,9 @@ basic_machine=m68k-isi os=-sysv ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + ;; m68knommu) basic_machine=m68k-unknown os=-linux @@ -794,7 +809,7 @@ os=-mingw64 ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -822,6 +837,10 @@ basic_machine=powerpc-unknown os=-morphos ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; msdos) basic_machine=i386-pc os=-msdos @@ -830,7 +849,7 @@ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i386-pc + basic_machine=i686-pc os=-msys ;; mvs) @@ -1367,14 +1386,14 @@ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1546,6 +1565,9 @@ c4x-* | tic4x-*) os=-coff ;; + c8051-*) + os=-elf + ;; hexagon-*) os=-elf
View file
libdvdcss-1.3.0.tar.bz2/configure -> libdvdcss-1.4.0.tar.bz2/configure
Changed
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libdvdcss 1.3.0. +# Generated by GNU Autoconf 2.69 for libdvdcss 1.4.0. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,10 +587,10 @@ # Identity of this package. PACKAGE_NAME='libdvdcss' PACKAGE_TARNAME='libdvdcss' -PACKAGE_VERSION='1.3.0' -PACKAGE_STRING='libdvdcss 1.3.0' +PACKAGE_VERSION='1.4.0' +PACKAGE_STRING='libdvdcss 1.4.0' PACKAGE_BUGREPORT='' -PACKAGE_URL='' +PACKAGE_URL='https://www.videolan.org/developers/libdvdcss.html' ac_unique_file="src/libdvdcss.c" # Factoring default headers for most tests. @@ -634,6 +634,12 @@ LTLIBOBJS LIBOBJS DVDCSS_LDFLAGS +DVDCSS_VERSION_MICRO +DVDCSS_VERSION_MINOR +DVDCSS_VERSION_MAJOR +GIT_FALSE +GIT_TRUE +GIT APIDOC_FALSE APIDOC_TRUE DOXYGEN @@ -641,6 +647,7 @@ SYS_MSVC_TRUE DVDCSS_LTVERSION CPP +LT_SYS_LIBRARY_PATH OTOOL64 OTOOL LIPO @@ -737,6 +744,7 @@ docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -765,6 +773,7 @@ enable_static with_pic enable_fast_install +with_aix_soname enable_dependency_tracking with_gnu_ld with_sysroot @@ -780,6 +789,7 @@ LDFLAGS LIBS CPPFLAGS +LT_SYS_LIBRARY_PATH CPP' @@ -819,6 +829,7 @@ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1071,6 +1082,15 @@ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1208,7 +1228,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1321,7 +1341,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libdvdcss 1.3.0 to adapt to many kinds of systems. +\`configure' configures libdvdcss 1.4.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1361,6 +1381,7 @@ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1391,7 +1412,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libdvdcss 1.3.0:";; + short | recursive ) echo "Configuration of libdvdcss 1.4.0:";; esac cat <<\_ACEOF @@ -1422,9 +1443,12 @@ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] + --with-aix-soname=aix|svr4|both + shared library versioning (aka "SONAME") variant to + provide on AIX, [default=aix]. --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR - (or the compiler's sysroot if not specified). + --with-sysroot[=DIR] Search for dependent libraries within DIR (or the + compiler's sysroot if not specified). Some influential environment variables: CC C compiler command @@ -1434,12 +1458,15 @@ LIBS libraries to pass to the linker, e.g. -l<library> CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if you have headers in a nonstandard directory <include dir> + LT_SYS_LIBRARY_PATH + User-defined run-time library search path. CPP C preprocessor Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. Report bugs to the package provider. +libdvdcss home page: <https://www.videolan.org/developers/libdvdcss.html>. _ACEOF ac_status=$? fi @@ -1502,7 +1529,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libdvdcss configure 1.3.0 +libdvdcss configure 1.4.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1967,7 +1994,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libdvdcss $as_me 1.3.0, which was +It was created by libdvdcss $as_me 1.4.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2419,7 +2446,7 @@ -am__api_version='1.14' +am__api_version='1.15' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2591,8 +2618,8 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then case $am_aux_dir in @@ -2611,7 +2638,7 @@ $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then
View file
libdvdcss-1.3.0.tar.bz2/configure.ac -> libdvdcss-1.4.0.tar.bz2/configure.ac
Changed
@@ -1,4 +1,10 @@ -AC_INIT(libdvdcss, 1.3.0) +dnl library version number +m4_define([dvdcss_major], 1) +m4_define([dvdcss_minor], 4) +m4_define([dvdcss_micro], 0) +m4_define([dvdcss_version],[dvdcss_major.dvdcss_minor.dvdcss_micro]) + +AC_INIT(libdvdcss, dvdcss_version, , , https://www.videolan.org/developers/libdvdcss.html) AC_CONFIG_SRCDIR([src/libdvdcss.c]) AC_PREREQ(2.50) @@ -39,11 +45,11 @@ dnl * in Linux, the library will be named dnl libname.so.(DVDCSS_LT_CURRENT - DVDCSS_LT_AGE).DVDCSS_LT_AGE.DVDCSS_LT_REVISION -DVDCSS_LT_CURRENT=3 -DVDCSS_LT_AGE=0 -DVDCSS_LT_REVISION=1 +DVDCSS_LT_CURRENT=4 +DVDCSS_LT_AGE=2 +DVDCSS_LT_REVISION=0 -AC_SUBST([DVDCSS_LTVERSION], [$DVDCSS_LT_CURRENT:$DVDCSS_LT_AGE:$DVDCSS_LT_REVISION]) +AC_SUBST([DVDCSS_LTVERSION], [$DVDCSS_LT_CURRENT:$DVDCSS_LT_REVISION:$DVDCSS_LT_AGE]) AC_PROG_CC AC_HEADER_STDC @@ -52,7 +58,7 @@ AC_C_INLINE AC_TYPE_SIZE_T -AC_CHECK_HEADERS([unistd.h sys/param.h sys/uio.h limits.h pwd.h]dnl +AC_CHECK_HEADERS([unistd.h sys/param.h sys/uio.h pwd.h]dnl [errno.h sys/types.h sys/stat.h fcntl.h io.h]) AC_CHECK_DECL([O_BINARY], [], @@ -104,19 +110,19 @@ xdarwin*) CFLAGS="${CFLAGS} -no-cpp-precomp" ;; - x*cygwin*) + x*cygwin* | x*msys*) CFLAGS="${CFLAGS} -mwin32" - AC_DEFINE([_WIN32_IE], 0x0500, [Define to '0x0500' for IE 5.0 (and shell) APIs.]) + AC_DEFINE([_WIN32_IE], 0x0501, [Define to '0x0501' for IE 5.01 (and shell) APIs.]) ;; xos2*) LDFLAGS="-Zbin-files" ;; x*msvc*) SYS_MSVC=1 - AC_DEFINE([_WIN32_IE], 0x0500, [Define to '0x0500' for IE 5.0 (and shell) APIs.]) + AC_DEFINE([_WIN32_IE], 0x0501, [Define to '0x0501' for IE 5.01 (and shell) APIs.]) ;; - x*mingw* | *wince* | *mingwce*) - AC_DEFINE([_WIN32_IE], 0x0500, [Define to '0x0500' for IE 5.0 (and shell) APIs.]) + x*mingw* | x*wince* | x*mingwce*) + AC_DEFINE([_WIN32_IE], 0x0501, [Define to '0x0501' for IE 5.01 (and shell) APIs.]) ;; x*) ;; @@ -138,7 +144,7 @@ ]) ]) -dnl for Un*x and BeOS +dnl for Unix AC_CHECK_HEADERS(sys/ioctl.h,[ CAN_BUILD_LIBDVDCSS=1 AC_CHECK_HEADERS(sys/cdio.h sys/dvdio.h linux/cdrom.h dvd.h) @@ -181,15 +187,7 @@ AC_DEFINE(SOLARIS_USCSI, 1, Have userspace SCSI headers.) ]) 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 <sys/scsi.h> defines sctl_io.) - ]) - ]) - dnl - dnl Darwin + dnl Darwin dnl AC_CHECK_HEADER(IOKit/storage/IODVDMediaBSDClient.h,[ AC_DEFINE(DARWIN_DVD_IOCTL, 1, Have IOKit DVD IOCTL headers) @@ -199,7 +197,7 @@ dnl Final tests to check what was detected dnl if test x$LINUX_DVD_STRUCT = x1; then - AC_DEFINE(HAVE_LINUX_DVD_STRUCT, 1, + AC_DEFINE(HAVE_LINUX_DVD_STRUCT, 1, Define if Linux-like dvd_struct is defined.) if test x$OPENBSD_DVD_STRUCT = x1; then AC_DEFINE(HAVE_OPENBSD_DVD_STRUCT, 1, @@ -213,7 +211,7 @@ fi ]) -CC_CHECK_CFLAGS_APPEND([-Wall -Wsign-compare -Wextra]) +CC_CHECK_CFLAGS_APPEND([-Wall -Wextra]) CC_FLAG_VISIBILITY([ CC_ATTRIBUTE_VISIBILITY([default], [ CFLAGS="${CFLAGS} -fvisibility=hidden" @@ -236,9 +234,22 @@ ]) AM_CONDITIONAL([APIDOC], [test "x$DOXYGEN" != "x"]) +AC_PATH_PROG([GIT], [git]) +AM_CONDITIONAL([GIT], [test "x$GIT" != "x"]) + +dnl export library version number +DVDCSS_VERSION_MAJOR=dvdcss_major() +DVDCSS_VERSION_MINOR=dvdcss_minor() +DVDCSS_VERSION_MICRO=dvdcss_micro() +AC_SUBST(DVDCSS_VERSION_MAJOR) +AC_SUBST(DVDCSS_VERSION_MINOR) +AC_SUBST(DVDCSS_VERSION_MICRO) + AC_SUBST(DVDCSS_LDFLAGS) AC_OUTPUT([ Makefile + libdvdcss.spec doc/doxygen.cfg src/libdvdcss.pc + src/dvdcss/version.h ])
View file
libdvdcss-1.3.0.tar.bz2/depcomp -> libdvdcss-1.4.0.tar.bz2/depcomp
Changed
@@ -3,7 +3,7 @@ scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # 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
View file
libdvdcss-1.3.0.tar.bz2/doc/doxygen.cfg.in -> libdvdcss-1.4.0.tar.bz2/doc/doxygen.cfg.in
Changed
@@ -58,7 +58,7 @@ # entered, it will be relative to the location where doxygen was started. If # left blank the current directory will be used. -OUTPUT_DIRECTORY = @top_builddir@/doc +OUTPUT_DIRECTORY = @abs_builddir@ # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub- # directories (in 2 levels) under the output directory of each output format and @@ -715,7 +715,7 @@ # documentation, but not about the absence of documentation. # The default value is: NO. -WARN_NO_PARAMDOC = NO +WARN_NO_PARAMDOC = YES # The WARN_FORMAT tag determines the format of the warning messages that doxygen # can produce. The string should contain the $file, $line, and $text tags, which @@ -743,8 +743,8 @@ # spaces. # Note: If this tag is empty the current directory is searched. -INPUT = @top_srcdir@/src/dvdcss/dvdcss.h \ - @top_srcdir@/src/libdvdcss.c +INPUT = @abs_top_srcdir@/src/dvdcss/dvdcss.h \ + @abs_top_srcdir@/src/libdvdcss.c # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses @@ -1037,7 +1037,7 @@ # of the possible markers and block names see the documentation. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_HEADER = @top_srcdir@/doc/header.html +HTML_HEADER = # The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each # generated HTML page. If the tag is left blank doxygen will generate a standard @@ -1047,7 +1047,7 @@ # that doxygen normally uses. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_FOOTER = @top_srcdir@/doc/footer.html +HTML_FOOTER = # The HTML_STYLESHEET tag can be used to specify a user-defined cascading style # sheet that is used by each HTML page. It can be used to fine-tune the look of @@ -1791,18 +1791,6 @@ XML_OUTPUT = xml -# The XML_SCHEMA tag can be used to specify a XML schema, which can be used by a -# validating XML parser to check the syntax of the XML files. -# This tag requires that the tag GENERATE_XML is set to YES. - -XML_SCHEMA = - -# The XML_DTD tag can be used to specify a XML DTD, which can be used by a -# validating XML parser to check the syntax of the XML files. -# This tag requires that the tag GENERATE_XML is set to YES. - -XML_DTD = - # If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program # listings (including syntax highlighting and cross-referencing information) to # the XML output. Note that enabling this will significantly increase the size
View file
libdvdcss-1.3.0.tar.bz2/install-sh -> libdvdcss-1.4.0.tar.bz2/install-sh
Changed
@@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-11-20.07; # UTC +scriptversion=2013-12-25.23; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -41,19 +41,15 @@ # This script is compatible with the BSD install script, but was written # from scratch. +tab=' ' nl=' ' -IFS=" "" $nl" +IFS=" $tab$nl" -# set DOITPROG to echo to test this script +# Set DOITPROG to "echo" to test this script. -# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi +doit_exec=${doit:-exec} # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -68,17 +64,6 @@ rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - posix_mkdir= # Desired mode of installed file. @@ -97,7 +82,7 @@ dst_arg= copy_on_change=false -no_target_directory= +is_target_a_directory=possibly usage="\ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -137,46 +122,57 @@ -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; -s) stripcmd=$stripprog;; - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; - -T) no_target_directory=true;; + -T) is_target_a_directory=never;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -208,6 +204,15 @@ fi if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + +if test -z "$dir_arg"; then do_exit='(exit $ret); exit $ret' trap "ret=129; $do_exit" 1 trap "ret=130; $do_exit" 2 @@ -223,16 +228,16 @@ *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -269,41 +274,15 @@ # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst dst=$dstdir/`basename "$src"` dstdir_status=0 else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/
View file
libdvdcss-1.3.0.tar.bz2/libdvdcss.spec -> libdvdcss-1.4.0.tar.bz2/libdvdcss.spec
Changed
@@ -1,8 +1,8 @@ -%define name libdvdcss -%define version 1.2.9 -%define release 1 +%define name libdvdcss +%define version 1.4.0 +%define release 1 -%define major 2 +%define major 2 %define libname %{name}%{major} %define buildfor_rh9 %([[ -e /etc/mandrake-release ]] && echo 0 || echo 1) @@ -16,29 +16,28 @@ %endif -Name: %{name} -Version: %{version} -Release: %{release} +Name: %{name} +Version: %{version} +Release: %{release}%{?dist} Summary: Library for accessing DVDs like block devices with transparent decryption -Source: %{name}-%{version}.tar.bz2 -License: GPL -Group: System/Libraries -URL: http://www.videolan.org/libdvdcss/ -Packager: Yves Duret <yves@zarb.org> -BuildRoot: %_tmppath/%name-%version-%release-root -Conflicts: libdvdcss0.0.1, libdvdcss0.0.2 +Source: %{name}-%{version}.tar.bz2 +License: GPL +Group: System/Libraries +URL: https://www.videolan.org/developers/libdvdcss.html +Packager: Yves Duret <yves@zarb.org> +BuildRoot: %_tmppath/%name-%version-%release-root +Conflicts: libdvdcss0.0.1, libdvdcss0.0.2 %description libdvdcss is a simple library designed for accessing DVDs like a block device without having to bother about the decryption. The important features are: - * Portability: currently supported platforms are GNU/Linux, FreeBSD, NetBSD, - OpenBSD, BeOS, Windows 98/ME, Windows NT/2000/XP, Mac OS X, Solaris, - HP-UX and OS/2. - * Adaptability: unlike most similar projects, libdvdcss doesn't require the + * Portability: Currently supported platforms are GNU/Linux, FreeBSD, NetBSD, + OpenBSD, Haiku, Mac OS X, Solaris, QNX, OS/2, and Windows 2000 or later. + * Adaptability: Unlike most similar projects, libdvdcss does not require the region of your drive to be set and will try its best to read from the disc even in the case of a region mismatch. - * Simplicity: a DVD player can be built around the libdvdcss API using no - more than 6 library calls. + * Simplicity: A DVD player can be built around the libdvdcss API using no + more than 4 or 5 library calls. %package -n %{libname} Summary: Library for accessing DVDs like block devices with transparent decryption @@ -48,28 +47,27 @@ %description -n %{libname} libdvdcss is a simple library designed for accessing DVDs like a block device without having to bother about the decryption. The important features are: - * Portability: currently supported platforms are GNU/Linux, FreeBSD, NetBSD, - OpenBSD, BeOS, Windows 98/ME, Windows NT/2000/XP, Mac OS X, Solaris, - HP-UX and OS/2. - * Adaptability: unlike most similar projects, libdvdcss doesn't require the + * Portability: Currently supported platforms are GNU/Linux, FreeBSD, NetBSD, + OpenBSD, Haiku, Mac OS X, Solaris, QNX, OS/2, and Windows 2000 or later. + * Adaptability: Unlike most similar projects, libdvdcss does not require the region of your drive to be set and will try its best to read from the disc even in the case of a region mismatch. - * Simplicity: a DVD player can be built around the libdvdcss API using no - more than 6 library calls. + * Simplicity: A DVD player can be built around the libdvdcss API using no + more than 4 or 5 library calls. %package -n %{libname}-devel Summary: Development tools for programs which will use the %{name} library Group: Development/C -Requires: %{libname} = %version-%release +Requires: %{libname} = %version-%release Provides: %{name}-devel = %version-%release - + %description -n %{libname}-devel The %{name}-devel package includes the header files and static libraries necessary for developing programs which will manipulate DVDs files using the %{name} library. - + If you are going to develop programs which will manipulate DVDs, you -should install %{name}-devel. You'll also need to have the %{name} +should install %{name}-devel. You will also need to have the %{name} package installed. %prep @@ -86,12 +84,13 @@ [ %buildroot != "/" ] && rm -Rf %buildroot %post -n %{libname} -p /sbin/ldconfig - + %postun -n %{libname} -p /sbin/ldconfig %files -n %{libname} %defattr(-,root,root) %doc AUTHORS COPYING NEWS +%{_docdir}/libdvdcss %{_libdir}/*.so.* %files -n %{libname}-devel @@ -100,6 +99,7 @@ %{_libdir}/*.a %{_libdir}/*.so %{_libdir}/*.la +%{_libdir}/pkgconfig/* %{_includedir}/* %changelog @@ -150,13 +150,13 @@ - major version is 2 (aka guillaume sux). - spec clean up: do not rm in %%prep, %%buildroot, %%makeinstall_std, %%provides %%version-%%release - added doc in devel -- sync with CVS's one (%%description,%%files, conflicts). +- sync with the CVS one (%%description,%%files, conflicts). - fix URL * Sat Apr 06 2002 Guillaume Rousse <rousse@ccr.jussieu.fr> 1.1.1-1plf - 1.1.1 -* Wed Jan 30 2002 Guillaume Rousse <rousse@ccr.jussieu.fr> 1.0.0-3plf +* Wed Jan 30 2002 Guillaume Rousse <rousse@ccr.jussieu.fr> 1.0.0-3plf - new plf extension * Wed Dec 05 2001 Guillaume Rousse <g.rousse@linux-mandrake.com> 1.0.0-3mdk
View file
libdvdcss-1.4.0.tar.bz2/libdvdcss.spec.in
Added
@@ -0,0 +1,181 @@ +%define name @PACKAGE_NAME@ +%define version @PACKAGE_VERSION@ +%define release 1 + +%define major 2 +%define libname %{name}%{major} + +%define buildfor_rh9 %([[ -e /etc/mandrake-release ]] && echo 0 || echo 1) + +%if %buildfor_rh9 +# some mdk macros that do not exist in rh +%define configure2_5x %configure +%define make %__make +%define makeinstall_std %makeinstall +# adjust define for Red Hat. +%endif + + +Name: %{name} +Version: %{version} +Release: %{release}%{?dist} +Summary: Library for accessing DVDs like block devices with transparent decryption +Source: %{name}-%{version}.tar.bz2 +License: GPL +Group: System/Libraries +URL: @PACKAGE_URL@ +Packager: Yves Duret <yves@zarb.org> +BuildRoot: %_tmppath/%name-%version-%release-root +Conflicts: libdvdcss0.0.1, libdvdcss0.0.2 + +%description +libdvdcss is a simple library designed for accessing DVDs like a block device +without having to bother about the decryption. The important features are: + * Portability: Currently supported platforms are GNU/Linux, FreeBSD, NetBSD, + OpenBSD, Haiku, Mac OS X, Solaris, QNX, OS/2, and Windows 2000 or later. + * Adaptability: Unlike most similar projects, libdvdcss does not require the + region of your drive to be set and will try its best to read from the disc + even in the case of a region mismatch. + * Simplicity: A DVD player can be built around the libdvdcss API using no + more than 4 or 5 library calls. + +%package -n %{libname} +Summary: Library for accessing DVDs like block devices with transparent decryption +Group: System/Libraries +Provides: %name = %version-%release + +%description -n %{libname} +libdvdcss is a simple library designed for accessing DVDs like a block device +without having to bother about the decryption. The important features are: + * Portability: Currently supported platforms are GNU/Linux, FreeBSD, NetBSD, + OpenBSD, Haiku, Mac OS X, Solaris, QNX, OS/2, and Windows 2000 or later. + * Adaptability: Unlike most similar projects, libdvdcss does not require the + region of your drive to be set and will try its best to read from the disc + even in the case of a region mismatch. + * Simplicity: A DVD player can be built around the libdvdcss API using no + more than 4 or 5 library calls. + +%package -n %{libname}-devel +Summary: Development tools for programs which will use the %{name} library +Group: Development/C +Requires: %{libname} = %version-%release +Provides: %{name}-devel = %version-%release + +%description -n %{libname}-devel +The %{name}-devel package includes the header files and static libraries +necessary for developing programs which will manipulate DVDs files using +the %{name} library. + +If you are going to develop programs which will manipulate DVDs, you +should install %{name}-devel. You will also need to have the %{name} +package installed. + +%prep +%setup -q + +%build +%configure2_5x +%make + +%install +%makeinstall_std + +%clean +[ %buildroot != "/" ] && rm -Rf %buildroot + +%post -n %{libname} -p /sbin/ldconfig + +%postun -n %{libname} -p /sbin/ldconfig + +%files -n %{libname} +%defattr(-,root,root) +%doc AUTHORS COPYING NEWS +%{_docdir}/libdvdcss +%{_libdir}/*.so.* + +%files -n %{libname}-devel +%defattr(-,root,root) +%doc ChangeLog COPYING +%{_libdir}/*.a +%{_libdir}/*.so +%{_libdir}/*.la +%{_libdir}/pkgconfig/* +%{_includedir}/* + +%changelog +* Mon Jul 11 2005 Sam Hocevar <sam@zoy.org> 1.2.9-1 +- new upstream release + +* Tue Jul 29 2003 Sam Hocevar <sam@zoy.org> 1.2.8-1 +- new upstream release + +* Fri Jun 13 2003 Sam Hocevar <sam@zoy.org> 1.2.7-1 +- new upstream release +- key cache activated by default + +* Mon Mar 10 2003 Alexis de Lattre <alexis@videolan.org> 1.2.6-1 +- new upstream release +- small bug fixes + +* Tue Jan 28 2003 Sam Hocevar <sam@zoy.org> 1.2.5-1 +- new upstream release +- improved robustness in case of read errors +- key cache support +- added more macros to fix Red Hat build + +* Mon Nov 18 2002 Alexis de Lattre <alexis@videolan.org> 1.2.4-2 +- Changes in .spec file for Red Hat and RPM 4.1 + +* Thu Nov 14 2002 Alexis de Lattre <alexis@videolan.org> 1.2.4-1 +- new upstream release +- fixes for Win32 + +* Sun Oct 13 2002 Sam Hocevar <sam@zoy.org> 1.2.3-1 +- new upstream release +- fix for drives not allowing to read their disc key + +* Sat Aug 10 2002 Sam Hocevar <sam@zoy.org> 1.2.2-1 +- new upstream release +- even more fixes for the disc/drive region mismatch problem + +* Sun Jun 02 2002 Sam Hocevar <sam@zoy.org> 1.2.1-1 +- new upstream release +- fix for a crash on disc/drive region mismatch + +* Mon May 20 2002 Sam Hocevar <sam@zoy.org> 1.2.0-1 +- new upstream release +- weird libxalf dependency is gone + +* Sun Apr 07 2002 Yves Duret <yduret@mandrakesoft.com> 1.1.1-2plf +- major version is 2 (aka guillaume sux). +- spec clean up: do not rm in %%prep, %%buildroot, %%makeinstall_std, %%provides %%version-%%release +- added doc in devel +- sync with the CVS one (%%description,%%files, conflicts). +- fix URL + +* Sat Apr 06 2002 Guillaume Rousse <rousse@ccr.jussieu.fr> 1.1.1-1plf +- 1.1.1 + +* Wed Jan 30 2002 Guillaume Rousse <rousse@ccr.jussieu.fr> 1.0.0-3plf +- new plf extension + +* Wed Dec 05 2001 Guillaume Rousse <g.rousse@linux-mandrake.com> 1.0.0-3mdk +- removed conflict + +* Tue Dec 04 2001 Guillaume Rousse <g.rousse@linux-mandrake.com> 1.0.0-2mdk +- contributed to PLF by Yves Duret <yduret@mandrakesoft.com> +- Conflicts: libdvdcss-ogle +- more doc files +- no doc file for devel package + +* Fri Nov 30 2001 Yves Duret <yduret@mandrakesoft.com> 1.0.0-1mdk +- version 1.0.0 + +* Thu Aug 23 2001 Yves Duret <yduret@mandrakesoft.com> 0.0.3-1mdk +- version 0.0.3 + +* Mon Aug 13 2001 Yves Duret <yduret@mandrakesoft.com> 0.0.2-1mdk +- version 0.0.2 + +* Tue Jun 19 2001 Yves Duret <yduret@mandrakesoft.com> 0.0.1-1mdk +- first release and first mdk release
View file
libdvdcss-1.3.0.tar.bz2/ltmain.sh -> libdvdcss-1.4.0.tar.bz2/ltmain.sh
Changed
@@ -1,9 +1,12 @@ +#! /bin/sh +## DO NOT EDIT - This file generated from ./build-aux/ltmain.in +## by inline-source v2014-01-03.01 -# libtool (GNU libtool) 2.4.2 +# libtool (GNU libtool) 2.4.5 +# Provide generalized library-building support services. # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1996-2015 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -23,881 +26,2105 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, -# or obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. -# Usage: $progname [OPTION]... [MODE-ARG]... -# -# Provide generalized library-building support services. -# -# --config show all configuration variables -# --debug enable verbose shell tracing -# -n, --dry-run display commands without modifying any files -# --features display basic configuration information and exit -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --no-quiet, --no-silent -# print informational messages (default) -# --no-warn don't display warning messages -# --tag=TAG use configuration variables from tag TAG -# -v, --verbose print more informational messages than default -# --no-verbose don't print the extra informational messages -# --version print version information -# -h, --help, --help-all print short, long, or detailed help message -# -# MODE must be one of the following: -# -# clean remove files from the build directory -# compile compile a source file into a libtool object -# execute automatically set library path, then run a program -# finish complete the installation of libtool libraries -# install install libraries or executables -# link create a library or an executable -# uninstall remove libraries from an installed directory -# -# MODE-ARGS vary depending on the MODE. When passed as first option, -# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. -# Try `$progname --help --mode=MODE' for a more detailed description of MODE. -# -# When reporting a bug, please describe a test case to reproduce it and -# include the following information: -# -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 -# automake: $automake_version -# autoconf: $autoconf_version -# -# Report bugs to <bug-libtool@gnu.org>. -# GNU libtool home page: <http://www.gnu.org/software/libtool/>. -# General help using GNU software: <http://www.gnu.org/gethelp/>. PROGRAM=libtool PACKAGE=libtool -VERSION=2.4.2 -TIMESTAMP="" -package_revision=1.3337 +VERSION=2.4.5 +package_revision=2.4.5 -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + +## ------ ## +## Usage. ## +## ------ ## + +# Run './libtool --help' for help with using this script from the +# command line. + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# After configure completes, it has a better idea of some of the +# shell tools we need than the defaults used by the functions shared +# with bootstrap, so set those here where they can still be over- +# ridden by the user, but otherwise take precedence. + +: ${AUTOCONF="autoconf"} +: ${AUTOMAKE="automake"} + + +## -------------------------- ## +## Source external libraries. ## +## -------------------------- ## + +# Much of our low-level functionality needs to be sourced from external +# libraries, which are installed to $pkgauxdir. + +# Set a version string for this script. +scriptversion=2014-01-03.01; # UTC + +# General shell script boiler plate, and helper functions. +# Written by Gary V. Vaughan, 2004 + +# Copyright (C) 2004-2015 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# 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 +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# As a special exception to the GNU General Public License, if you distribute +# this file as part of a program or library that is built using GNU Libtool, +# you may include this file under the same distribution terms that you use +# for the rest of that program. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# Evaluate this file near the top of your script to gain access to +# the functions and variables defined here: +# +# . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh +# +# If you need to override any of the default environment variable +# settings, do that before evaluating this file. + + +## -------------------- ## +## Shell normalisation. ## +## -------------------- ## + +# Some shells need a little help to be as Bourne compatible as possible. +# Before doing anything else, make sure all that help has been provided! + +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' -} -# NLS nuisances: We save the old values to restore during execute mode. -lt_user_locale= -lt_safe_locale= -for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +# NLS nuisances: We save the old values in case they are required later. +_G_user_locale= +_G_safe_locale= +for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES do - eval "if test \"\${$lt_var+set}\" = set; then
View file
libdvdcss-1.3.0.tar.bz2/m4/attributes.m4 -> libdvdcss-1.4.0.tar.bz2/m4/attributes.m4
Changed
@@ -39,7 +39,7 @@ AC_CACHE_VAL(AS_TR_SH([cc_cv_cflags_$1]), [ac_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $1" - AC_LINK_IFELSE([AC_LANG_SOURCE([int main() { return 0; }])], + AC_LINK_IFELSE([AC_LANG_SOURCE([int main(void) { return 0; }])], [eval "AS_TR_SH([cc_cv_cflags_$1])='yes'"], [eval "AS_TR_SH([cc_cv_cflags_$1])='no'"]) CFLAGS="$ac_save_CFLAGS" @@ -89,7 +89,7 @@ AS_TR_SH([cc_cv_ldflags_$1]), [ac_save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $1" - AC_LINK_IFELSE([AC_LANG_SOURCE([int main() { return 1; }])], + AC_LINK_IFELSE([AC_LANG_SOURCE([int main(void) { return 1; }])], [eval "AS_TR_SH([cc_cv_ldflags_$1])='yes'"], [eval "AS_TR_SH([cc_cv_ldflags_$1])="]) LDFLAGS="$ac_save_LDFLAGS" @@ -131,8 +131,7 @@ AS_IF([eval test x$]AS_TR_SH([cc_cv_attribute_$1])[ = xyes], [AC_DEFINE( AS_TR_CPP([SUPPORT_ATTRIBUTE_$1]), 1, - [Define this if the compiler supports __attribute__(( ifelse([$2], , [$1], [$2]) ))] - ) + Define this if the compiler supports __attribute__((ifelse([$2], , [$1], [$2])))) $4], [$5]) ]) @@ -239,8 +238,8 @@ [cc_flag_visibility_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $cc_cv_werror" CC_CHECK_CFLAGS_SILENT([-fvisibility=hidden], - cc_cv_flag_visibility='yes', - cc_cv_flag_visibility='no') + cc_cv_flag_visibility='yes', + cc_cv_flag_visibility='no') CFLAGS="$cc_flag_visibility_save_CFLAGS"]) AS_IF([test "x$cc_cv_flag_visibility" = "xyes"], @@ -260,7 +259,7 @@ [int some_function() { int a = 3; return (int)__builtin_expect(a, 3); - }], + }], [cc_cv_func_expect=yes], [cc_cv_func_expect=no]) CFLAGS="$ac_save_CFLAGS" @@ -281,7 +280,7 @@ CFLAGS="$CFLAGS $cc_cv_werror" for cc_attribute_align_try in 64 32 16 8 4 2; do AC_COMPILE_IFELSE([ - int main() { + int main(void) { static char c __attribute__ ((aligned($cc_attribute_align_try))) = 0; return c; }], [cc_cv_attribute_aligned=$cc_attribute_align_try; break])
View file
libdvdcss-1.3.0.tar.bz2/m4/libtool.m4 -> libdvdcss-1.4.0.tar.bz2/m4/libtool.m4
Changed
@@ -1,8 +1,6 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -10,36 +8,30 @@ # modifications, as long as this notice is preserved. m4_define([_LT_COPYING], [dnl -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. # -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. # -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of +# GNU Libtool is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. ]) -# serial 57 LT_INIT +# serial 58 LT_INIT # LT_PREREQ(VERSION) @@ -67,7 +59,7 @@ # LT_INIT([OPTIONS]) # ------------------ AC_DEFUN([LT_INIT], -[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT +[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl AC_BEFORE([$0], [LT_LANG])dnl AC_BEFORE([$0], [LT_OUTPUT])dnl @@ -91,7 +83,7 @@ _LT_SET_OPTIONS([$0], [$1]) # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +LIBTOOL_DEPS=$ltmain # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -111,26 +103,43 @@ dnl AC_DEFUN([AM_PROG_LIBTOOL], []) +# _LT_PREPARE_CC_BASENAME +# ----------------------- +m4_defun([_LT_PREPARE_CC_BASENAME], [ +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in @S|@*""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} +])# _LT_PREPARE_CC_BASENAME + + # _LT_CC_BASENAME(CC) # ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME, +# but that macro is also expanded into generated libtool script, which +# arranges for $SED and $ECHO to be set by different means. m4_defun([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +[m4_require([_LT_PREPARE_CC_BASENAME])dnl +AC_REQUIRE([_LT_DECL_SED])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +func_cc_basename $1 +cc_basename=$func_cc_basename_result ]) # _LT_FILEUTILS_DEFAULTS # ---------------------- # It is okay to use these file commands and assume they have been set -# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. +# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'. m4_defun([_LT_FILEUTILS_DEFAULTS], [: ${CP="cp -f"} : ${MV="mv -f"} @@ -177,15 +186,16 @@ m4_require([_LT_CMD_OLD_ARCHIVE])dnl m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl m4_require([_LT_WITH_SYSROOT])dnl +m4_require([_LT_CMD_TRUNCATE])dnl _LT_CONFIG_LIBTOOL_INIT([ -# See if we are running on zsh, and set the options which allow our +# See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then +if test -n "\${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi ]) -if test -n "${ZSH_VERSION+set}" ; then +if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi @@ -198,7 +208,7 @@ # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then + if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -209,14 +219,14 @@ ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a '.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" +with_gnu_ld=$lt_cv_prog_gnu_ld -old_CC="$CC" -old_CFLAGS="$CFLAGS" +old_CC=$CC +old_CFLAGS=$CFLAGS # Set sane defaults for various variables test -z "$CC" && CC=cc @@ -269,14 +279,14 @@ # _LT_PROG_LTMAIN # --------------- -# Note that this code is called both from `configure', and `config.status' +# Note that this code is called both from 'configure', and 'config.status' # now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -# `config.status' has no value for ac_aux_dir unless we are using Automake, +# 'config.status' has no value for ac_aux_dir unless we are using Automake, # so we pass a copy along to make sure it has a sensible value anyway. m4_defun([_LT_PROG_LTMAIN], [m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl _LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh ])# _LT_PROG_LTMAIN
View file
libdvdcss-1.3.0.tar.bz2/m4/ltoptions.m4 -> libdvdcss-1.4.0.tar.bz2/m4/ltoptions.m4
Changed
@@ -1,14 +1,14 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 7 ltoptions.m4 +# serial 8 ltoptions.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) @@ -29,7 +29,7 @@ [m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), _LT_MANGLE_DEFUN([$1], [$2]), - [m4_warning([Unknown $1 option `$2'])])[]dnl + [m4_warning([Unknown $1 option '$2'])])[]dnl ]) @@ -75,13 +75,15 @@ dnl dnl If no reference was made to various pairs of opposing options, then dnl we run the default mode handler for the pair. For example, if neither - dnl `shared' nor `disable-shared' was passed, we enable building of shared + dnl 'shared' nor 'disable-shared' was passed, we enable building of shared dnl archives by default: _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], - [_LT_ENABLE_FAST_INSTALL]) + [_LT_ENABLE_FAST_INSTALL]) + _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4], + [_LT_WITH_AIX_SONAME([aix])]) ]) ])# _LT_SET_OPTIONS @@ -112,7 +114,7 @@ [_LT_SET_OPTION([LT_INIT], [dlopen]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `dlopen' option into LT_INIT's first parameter.]) +put the 'dlopen' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -148,7 +150,7 @@ _LT_SET_OPTION([LT_INIT], [win32-dll]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `win32-dll' option into LT_INIT's first parameter.]) +put the 'win32-dll' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -157,9 +159,9 @@ # _LT_ENABLE_SHARED([DEFAULT]) # ---------------------------- -# implement the --enable-shared flag, and supports the `shared' and -# `disable-shared' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-shared flag, and supports the 'shared' and +# 'disable-shared' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_SHARED], [m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([shared], @@ -172,14 +174,14 @@ *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) @@ -211,9 +213,9 @@ # _LT_ENABLE_STATIC([DEFAULT]) # ---------------------------- -# implement the --enable-static flag, and support the `static' and -# `disable-static' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-static flag, and support the 'static' and +# 'disable-static' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_STATIC], [m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([static], @@ -226,14 +228,14 @@ *) enable_static=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_static=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_static=]_LT_ENABLE_STATIC_DEFAULT) @@ -265,9 +267,9 @@ # _LT_ENABLE_FAST_INSTALL([DEFAULT]) # ---------------------------------- -# implement the --enable-fast-install flag, and support the `fast-install' -# and `disable-fast-install' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-fast-install flag, and support the 'fast-install' +# and 'disable-fast-install' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_FAST_INSTALL], [m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([fast-install], @@ -280,14 +282,14 @@ *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) @@ -304,14 +306,14 @@ [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `fast-install' option into LT_INIT's first parameter.]) +the 'fast-install' option into LT_INIT's first parameter.]) ]) AU_DEFUN([AC_DISABLE_FAST_INSTALL], [_LT_SET_OPTION([LT_INIT], [disable-fast-install]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `disable-fast-install' option into LT_INIT's first parameter.]) +the 'disable-fast-install' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -319,11 +321,64 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) +# _LT_WITH_AIX_SONAME([DEFAULT]) +# ---------------------------------- +# implement the --with-aix-soname flag, and support the `aix-soname=aix' +# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT +# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'. +m4_define([_LT_WITH_AIX_SONAME], +[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl +shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[[5-9]]*,yes) + AC_MSG_CHECKING([which variant of shared library versioning to provide]) + AC_ARG_WITH([aix-soname], + [AS_HELP_STRING([--with-aix-soname=aix|svr4|both], + [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])], + [case $withval in + aix|svr4|both) + ;; + *) + AC_MSG_ERROR([Unknown argument to --with-aix-soname]) + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname], + [AC_CACHE_VAL([lt_cv_with_aix_soname],
View file
libdvdcss-1.3.0.tar.bz2/m4/ltsugar.m4 -> libdvdcss-1.4.0.tar.bz2/m4/ltsugar.m4
Changed
@@ -1,6 +1,7 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives @@ -33,7 +34,7 @@ # ------------ # Manipulate m4 lists. # These macros are necessary as long as will still need to support -# Autoconf-2.59 which quotes differently. +# Autoconf-2.59, which quotes differently. m4_define([lt_car], [[$1]]) m4_define([lt_cdr], [m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], @@ -44,7 +45,7 @@ # lt_append(MACRO-NAME, STRING, [SEPARATOR]) # ------------------------------------------ -# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. +# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'. # Note that neither SEPARATOR nor STRING are expanded; they are appended # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). # No SEPARATOR is output if MACRO-NAME was previously undefined (different
View file
libdvdcss-1.3.0.tar.bz2/m4/ltversion.m4 -> libdvdcss-1.4.0.tar.bz2/m4/ltversion.m4
Changed
@@ -1,6 +1,6 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004 Free Software Foundation, Inc. +# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -9,15 +9,15 @@ # @configure_input@ -# serial 3337 ltversion.m4 +# serial 4171 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.2]) -m4_define([LT_PACKAGE_REVISION], [1.3337]) +m4_define([LT_PACKAGE_VERSION], [2.4.5]) +m4_define([LT_PACKAGE_REVISION], [2.4.5]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.2' -macro_revision='1.3337' +[macro_version='2.4.5' +macro_revision='2.4.5' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ])
View file
libdvdcss-1.3.0.tar.bz2/m4/lt~obsolete.m4 -> libdvdcss-1.4.0.tar.bz2/m4/lt~obsolete.m4
Changed
@@ -1,6 +1,7 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives @@ -11,7 +12,7 @@ # These exist entirely to fool aclocal when bootstrapping libtool. # -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN), # which have later been changed to m4_define as they aren't part of the # exported API, or moved to Autoconf or Automake where they belong. # @@ -25,7 +26,7 @@ # included after everything else. This provides aclocal with the # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything # because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. # # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. # Yes, that means every name once taken will need to remain here until
View file
libdvdcss-1.3.0.tar.bz2/missing -> libdvdcss-1.4.0.tar.bz2/missing
Changed
@@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-06-26.16; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -160,7 +160,7 @@ ;; autom4te*) echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." + echo "the 'autom4te' program to be rebuilt." program_details 'autom4te' ;; bison*|yacc*)
View file
libdvdcss-1.3.0.tar.bz2/msvc/config.h -> libdvdcss-1.4.0.tar.bz2/msvc/config.h
Changed
@@ -13,7 +13,6 @@ /* #undef HAVE_LINUX_DVD_STRUCT */ #define HAVE_MEMORY_H 1 /* #undef HAVE_OPENBSD_DVD_STRUCT */ -/* #undef HAVE_STDINT_H */ #define HAVE_STDLIB_H 1 #define HAVE_STRINGS_H 1 #define HAVE_STRING_H 1 @@ -27,7 +26,6 @@ #define HAVE_WINDOWS_H 1 #define HAVE_WINIOCTL_H 1 /* #undef HAVE__SYS_DEV_SCSI_SCSI_IOCTL_H */ -/* #undef HPUX_SCTL_IO */ #define PACKAGE "libdvdcss" #define PACKAGE_BUGREPORT "" #define PACKAGE_NAME "libdvdcss" @@ -37,10 +35,10 @@ /* #undef SOLARIS_USCSI */ #define STDC_HEADERS 1 #define VERSION "1.3.0" -#define _WIN32_IE 0x0500 +#define _WIN32_IE 0x0501 /* #undef const */ /* #undef inline */ /* #undef size_t */ #define HAVE_BROKEN_MKDIR 1 #define _CRT_SECURE_NO_WARNINGS 1 - +#define LIBDVDCSS_EXPORTS 1
View file
libdvdcss-1.3.0.tar.bz2/src/common.h -> libdvdcss-1.4.0.tar.bz2/src/common.h
Changed
@@ -8,12 +8,12 @@ * Vincent Seguin <seguin@via.ecp.fr> * Gildas Bazin <gbazin@netcourrier.com> * - * This program is free software; you can redistribute it and/or modify + * libdvdcss is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * libdvdcss is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -26,30 +26,12 @@ #ifndef DVDCSS_COMMON_H #define DVDCSS_COMMON_H -/***************************************************************************** - * Basic types definitions - *****************************************************************************/ -#if defined( HAVE_STDINT_H ) -# include <stdint.h> -#elif defined( HAVE_INTTYPES_H ) -# include <inttypes.h> -#else - /* Fallback types (very x86-centric, sorry) */ - typedef unsigned char uint8_t; - typedef signed char int8_t; - typedef unsigned int uint32_t; - typedef signed int int32_t; -#endif - -#if defined( WIN32 ) +#if defined( _WIN32 ) # include <io.h> /* _lseeki64 */ -# ifndef PATH_MAX -# define PATH_MAX MAX_PATH -# endif - /* several type definitions */ # if defined( __MINGW32__ ) +# undef lseek # define lseek _lseeki64 # if !defined( _OFF_T_ ) typedef long long _off_t; @@ -58,9 +40,10 @@ # else # define off_t long long # endif -# endif +# endif /* defined( __MINGW32__ ) */ # if defined( _MSC_VER ) +# undef lseek # define lseek _lseeki64 # if !defined( _OFF_T_DEFINED ) typedef __int64 off_t; @@ -68,17 +51,22 @@ # else # define off_t __int64 # endif -# define stat _stati64 +# define ssize_t SSIZE_T # define snprintf _snprintf -# endif +# define strdup _strdup +# define open _open +# define close _close +# define read _read +# define write _write +# endif /* defined( _MSC_VER ) */ -#endif +#endif /* defined( _WIN32 ) */ #ifdef __ANDROID__ # undef lseek # define lseek lseek64 # undef off_t # define off_t off64_t -#endif +#endif /* __ANDROID__ */ #endif /* DVDCSS_COMMON_H */
View file
libdvdcss-1.3.0.tar.bz2/src/css.c -> libdvdcss-1.4.0.tar.bz2/src/css.c
Changed
@@ -15,18 +15,18 @@ * - DecVOB * see http://www.lemuria.org/DeCSS/ by Tom Vogt for more information. * - * This library is free software; you can redistribute it and/or modify + * libdvdcss is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, + * libdvdcss is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along - * with this library; if not, write to the Free Software Foundation, Inc., + * with libdvdcss; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *****************************************************************************/ @@ -35,11 +35,11 @@ *****************************************************************************/ #include "config.h" +#include <limits.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <sys/types.h> -#include <sys/stat.h> #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif @@ -48,10 +48,6 @@ #endif #include <fcntl.h> -#ifdef HAVE_LIMITS_H -# include <limits.h> -#endif - #include "dvdcss/dvdcss.h" #include "common.h" @@ -61,77 +57,79 @@ #include "ioctl.h" #include "device.h" -#define PSZ_KEY_SIZE (KEY_SIZE * 3) +#define PSZ_KEY_SIZE (DVD_KEY_SIZE * 3) /***************************************************************************** * Local prototypes *****************************************************************************/ -static void PrintKey ( dvdcss_t, char *, uint8_t const * ); +static void PrintKey ( dvdcss_t, const char *, const uint8_t * ); static int GetBusKey ( dvdcss_t ); static int GetASF ( dvdcss_t ); -static void CryptKey ( int, int, uint8_t const *, uint8_t * ); +static void CryptKey ( int, int, const uint8_t *, uint8_t * ); static void DecryptKey ( uint8_t, - uint8_t const *, uint8_t const *, uint8_t * ); + const uint8_t *, const uint8_t *, uint8_t * ); -static int DecryptDiscKey ( dvdcss_t, uint8_t const *, dvd_key_t ); -static int CrackDiscKey ( dvdcss_t, uint8_t * ); +static int DecryptDiscKey ( dvdcss_t, const uint8_t *, dvd_key ); +static int CrackDiscKey ( uint8_t * ); -static void DecryptTitleKey ( dvd_key_t, dvd_key_t ); -static int RecoverTitleKey ( int, uint8_t const *, - uint8_t const *, uint8_t const *, uint8_t * ); -static int CrackTitleKey ( dvdcss_t, int, int, dvd_key_t ); +static void DecryptTitleKey ( dvd_key, dvd_key ); +static int RecoverTitleKey ( int, const uint8_t *, + const uint8_t *, const uint8_t *, uint8_t * ); +static int CrackTitleKey ( dvdcss_t, int, int, dvd_key ); -static int AttackPattern ( uint8_t const[], int, uint8_t * ); +static int AttackPattern ( const uint8_t[], uint8_t * ); #if 0 -static int AttackPadding ( uint8_t const[], int, uint8_t * ); +static int AttackPadding ( const uint8_t[] ); #endif -static int _dvdcss_titlekey ( dvdcss_t, int , dvd_key_t ); +static int dvdcss_titlekey ( dvdcss_t, int, dvd_key ); /***************************************************************************** - * _dvdcss_test: check if the disc is encrypted or not + * dvdcss_test: check if the disc is encrypted or not ***************************************************************************** * Return values: * 1: DVD is scrambled but can be read * 0: DVD is not scrambled and can be read * -1: could not get "copyright" information - * -2: could not get RPC information (reading the disc might be possible) + * -2: could not get RPC (Regional Playback Control) information + * (reading the disc might be possible) * -3: drive is RPC-II, region is not set, and DVD is scrambled: the RPC * scheme will prevent us from reading the scrambled data *****************************************************************************/ -int _dvdcss_test( dvdcss_t dvdcss ) +int dvdcss_test( dvdcss_t dvdcss ) { - char const *psz_type, *psz_rpc; - int i_ret, i_copyright, i_type, i_mask, i_rpc; + const char *psz_type, *psz_rpc; + char psz_region[16]; + char *p_region = psz_region; + int i_ret, i_copyright, i_type, i_mask, i_rpc, i_region; i_ret = ioctl_ReadCopyright( dvdcss->i_fd, 0 /* i_layer */, &i_copyright ); -#ifdef WIN32 if( i_ret < 0 ) { +#ifdef _WIN32 /* Maybe we didn't have enough privileges to read the copyright * (see ioctl_ReadCopyright comments). - * Apparently, on unencrypted DVDs _dvdcss_disckey() always fails, so + * Apparently, on unencrypted DVDs dvdcss_disckey() always fails, so * we can check this as a workaround. */ - i_ret = 0; - i_copyright = 1; - if( _dvdcss_disckey( dvdcss ) < 0 ) + if( dvdcss_disckey( dvdcss ) < 0 ) { i_copyright = 0; } - } -#endif - - if( i_ret < 0 ) - { + else + { + i_copyright = 1; + } +#else /* Since it's the first ioctl we try to issue, we add a notice */ - print_error( dvdcss, "css error: could not get \"copyright\"" + print_error( dvdcss, "CSS error: could not get \"copyright\"" " information, make sure there is a DVD in the drive," " and that you have used the correct device node." ); return -1; +#endif /* _WIN32 */ } print_debug( dvdcss, "disc reports copyright information 0x%x", @@ -141,7 +139,8 @@ if( i_ret < 0 ) { - print_error( dvdcss, "css error: could not get RPC status. Assuming RPC-I drive." ); + print_error( dvdcss, "CSS error: could not get RPC (Regional Playback " + "Control) status. Assuming RPC-I drive." ); i_type = i_mask = i_rpc = 0; } @@ -149,7 +148,7 @@ { case 0: psz_rpc = "RPC-I"; break; case 1: psz_rpc = "RPC-II"; break; - default: psz_rpc = "unknown RPC scheme"; break; + default: psz_rpc = "unknown RPC (Regional Playback Control) scheme"; break; } switch( i_type ) @@ -161,12 +160,21 @@ default: psz_type = "unknown status"; break; } - print_debug( dvdcss, "drive region mask 0x%x, %s, %s", - i_mask, psz_rpc, psz_type ); + for( i_region = 0; i_region < 8; i_region++ ) + { + if( !( i_mask & ( 1 << i_region ) ) ) + { + sprintf(p_region, " %d", i_region + 1); + p_region += 2; + } + } + + print_debug( dvdcss, "drive region(s)%s, region mask 0x%x, %s, %s", + psz_region, i_mask, psz_rpc, psz_type ); if( i_copyright && i_rpc == 1 && i_type == 0 ) { - print_error( dvdcss, "css error: drive will prevent access to " + print_error( dvdcss, "CSS error: drive will prevent access to " "scrambled data" ); return -3; } @@ -175,17 +183,17 @@
View file
libdvdcss-1.3.0.tar.bz2/src/css.h -> libdvdcss-1.4.0.tar.bz2/src/css.h
Changed
@@ -11,12 +11,12 @@ * - DeCSSPlus by Ethan Hawke * - The Divide and conquer attack by Frank A. Stevenson <frank@funcom.com> * - * This program is free software; you can redistribute it and/or modify + * libdvdcss is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * libdvdcss is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -29,33 +29,37 @@ #ifndef DVDCSS_CSS_H #define DVDCSS_CSS_H +#include <stdint.h> + #include "dvdcss/dvdcss.h" -#define KEY_SIZE 5 +#define CACHE_FILENAME_LENGTH_STRING "10" + +#define DVD_KEY_SIZE 5 -typedef uint8_t dvd_key_t[KEY_SIZE]; +typedef uint8_t dvd_key[DVD_KEY_SIZE]; -typedef struct dvd_title_s +typedef struct dvd_title { - int i_startlb; - dvd_key_t p_key; - struct dvd_title_s *p_next; -} dvd_title_t; + int i_startlb; + dvd_key p_key; + struct dvd_title *p_next; +} dvd_title; -typedef struct css_s +typedef struct css { int i_agid; /* Current Authentication Grant ID. */ - dvd_key_t p_bus_key; /* Current session key. */ - dvd_key_t p_disc_key; /* This DVD disc's key. */ - dvd_key_t p_title_key; /* Current title key. */ -} css_t; + dvd_key p_bus_key; /* Current session key. */ + dvd_key p_disc_key; /* This DVD disc's key. */ + dvd_key p_title_key; /* Current title key. */ +} css; /***************************************************************************** * Prototypes in css.c *****************************************************************************/ -int _dvdcss_test ( dvdcss_t ); -int _dvdcss_title ( dvdcss_t, int ); -int _dvdcss_disckey ( dvdcss_t ); -int _dvdcss_unscramble ( uint8_t *, uint8_t * ); +int dvdcss_test ( dvdcss_t ); +int dvdcss_title ( dvdcss_t, int ); +int dvdcss_disckey ( dvdcss_t ); +int dvdcss_unscramble ( uint8_t *, uint8_t * ); #endif /* DVDCSS_CSS_H */
View file
libdvdcss-1.3.0.tar.bz2/src/csstables.h -> libdvdcss-1.4.0.tar.bz2/src/csstables.h
Changed
@@ -13,12 +13,12 @@ * - DecVOB * see http://www.lemuria.org/DeCSS/ by Tom Vogt for more information. * - * This program is free software; you can redistribute it and/or modify + * libdvdcss is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * libdvdcss is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -31,6 +31,8 @@ #ifndef DVDCSS_CSSTABLES_H #define DVDCSS_CSSTABLES_H +#include <stdint.h> + static const uint8_t p_css_tab1[ 256 ] = { 0x33, 0x73, 0x3b, 0x26, 0x63, 0x23, 0x6b, 0x76,
View file
libdvdcss-1.3.0.tar.bz2/src/device.c -> libdvdcss-1.4.0.tar.bz2/src/device.c
Changed
@@ -7,18 +7,18 @@ * Sam Hocevar <sam@zoy.org> * Håkan Hjort <d95hjort@dtek.chalmers.se> * - * This library is free software; you can redistribute it and/or modify + * libdvdcss is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, + * libdvdcss is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along - * with this library; if not, write to the Free Software Foundation, Inc., + * with libdvdcss; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *****************************************************************************/ @@ -27,6 +27,7 @@ *****************************************************************************/ #include "config.h" +#include <limits.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -44,10 +45,6 @@ # include <unistd.h> #endif -#ifdef HAVE_LIMITS_H -# include <limits.h> -#endif - #ifdef DARWIN_DVD_IOCTL # include <paths.h> # include <CoreFoundation/CoreFoundation.h> @@ -77,46 +74,38 @@ /***************************************************************************** * Device reading prototypes *****************************************************************************/ -static int libc_open ( dvdcss_t, char const * ); +static int libc_open ( dvdcss_t, const char * ); static int libc_seek ( dvdcss_t, int ); static int libc_read ( dvdcss_t, void *, int ); -static int libc_readv ( dvdcss_t, struct iovec *, int ); - -#ifdef WIN32 -static int win2k_open ( dvdcss_t, char const * ); -static int aspi_open ( dvdcss_t, char const * ); -static int win2k_seek ( dvdcss_t, int ); -static int aspi_seek ( dvdcss_t, int ); -static int win2k_read ( dvdcss_t, void *, int ); -static int aspi_read ( dvdcss_t, void *, int ); -static int win_readv ( dvdcss_t, struct iovec *, int ); - -static int aspi_read_internal ( int, void *, int ); +static int libc_readv ( dvdcss_t, const struct iovec *, int ); + +static int stream_seek ( dvdcss_t, int ); +static int stream_read ( dvdcss_t, void *, int ); +static int stream_readv ( dvdcss_t, const struct iovec *, int ); + +#ifdef _WIN32 +static int win2k_open ( dvdcss_t, const char * ); +static int win2k_seek ( dvdcss_t, int ); +static int win2k_read ( dvdcss_t, void *, int ); +static int win2k_readv ( dvdcss_t, const struct iovec *, int ); + #elif defined( __OS2__ ) -static int os2_open ( dvdcss_t, char const * ); -/* just use macros for libc */ -# define os2_seek libc_seek -# define os2_read libc_read -# define os2_readv libc_readv +static int os2_open ( dvdcss_t, const char * ); #endif -int _dvdcss_use_ioctls( dvdcss_t dvdcss ) +int dvdcss_use_ioctls( dvdcss_t dvdcss ) { -#if defined( WIN32 ) + if( dvdcss->p_stream ) + return 0; + +#if defined( _WIN32 ) if( dvdcss->b_file ) { return 0; } /* FIXME: implement this for Windows */ - if( WIN2K ) - { - return 1; - } - else - { - return 1; - } + return 1; #elif defined( __OS2__ ) ULONG ulMode; @@ -162,9 +151,9 @@ #endif } -void _dvdcss_check ( dvdcss_t dvdcss ) +void dvdcss_check_device ( dvdcss_t dvdcss ) { -#if defined( WIN32 ) +#if defined( _WIN32 ) DWORD drives; int i; #elif defined( DARWIN_DVD_IOCTL ) @@ -196,17 +185,17 @@ int i; #else - char *ppsz_devices[] = { "/dev/dvd", "/dev/cdrom", "/dev/hdc", NULL }; + const char *ppsz_devices[] = { "/dev/dvd", "/dev/cdrom", "/dev/hdc", NULL }; int i, i_fd; #endif - /* If the device name is non-null, return */ - if( dvdcss->psz_device[0] ) + /* If the device name is non-NULL or stream is set, return. */ + if( (dvdcss->psz_device && dvdcss->psz_device[0]) || dvdcss->p_stream ) { return; } -#if defined( WIN32 ) +#if defined( _WIN32 ) drives = GetLogicalDrives(); for( i = 0; drives; i++ ) @@ -352,55 +341,62 @@ print_error( dvdcss, "could not find a suitable default drive" ); } -int _dvdcss_open ( dvdcss_t dvdcss ) +int dvdcss_open_device ( dvdcss_t dvdcss ) { - char const *psz_device = dvdcss->psz_device; - + const char *psz_device = getenv( "DVDCSS_RAW_DEVICE" ); + if( !psz_device ) + { + psz_device = dvdcss->psz_device; + } print_debug( dvdcss, "opening target `%s'", psz_device ); -#if defined( WIN32 ) +#if defined( _WIN32 ) + /* Initialize readv temporary buffer */ + dvdcss->p_readv_buffer = NULL; + dvdcss->i_readv_buf_size = 0; +#endif + + /* if callback functions are initialized */ + if( dvdcss->p_stream ) + { + print_debug( dvdcss, "using stream API for access" ); + dvdcss->pf_seek = stream_seek; + dvdcss->pf_read = stream_read; + dvdcss->pf_readv = stream_readv; + return 0; + } + +#if defined( _WIN32 ) dvdcss->b_file = 1; /* If device is "X:" or "X:\", we are not actually opening a file. */ if (psz_device[0] && psz_device[1] == ':' && (!psz_device[2] || (psz_device[2] == '\\' && !psz_device[3]))) dvdcss->b_file = 0; - /* Initialize readv temporary buffer */ - dvdcss->p_readv_buffer = NULL; - dvdcss->i_readv_buf_size = 0; - - if( !dvdcss->b_file && WIN2K ) + if( !dvdcss->b_file ) { print_debug( dvdcss, "using Win2K API for access" ); dvdcss->pf_seek = win2k_seek; dvdcss->pf_read = win2k_read; - dvdcss->pf_readv = win_readv; + dvdcss->pf_readv = win2k_readv; return win2k_open( dvdcss, psz_device ); } - else if( !dvdcss->b_file ) - { - print_debug( dvdcss, "using ASPI for access" ); - dvdcss->pf_seek = aspi_seek;
View file
libdvdcss-1.3.0.tar.bz2/src/device.h -> libdvdcss-1.4.0.tar.bz2/src/device.h
Changed
@@ -7,12 +7,12 @@ * Sam Hocevar <sam@zoy.org> * Håkan Hjort <d95hjort@dtek.chalmers.se> * - * This program is free software; you can redistribute it and/or modify + * libdvdcss is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * libdvdcss is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -44,22 +44,13 @@ #include "dvdcss/dvdcss.h" -#if !defined(WIN32) && !defined(__OS2__) -# define DVDCSS_RAW_OPEN -#endif - /***************************************************************************** * Device reading prototypes *****************************************************************************/ -int _dvdcss_use_ioctls ( dvdcss_t ); -void _dvdcss_check ( dvdcss_t ); -int _dvdcss_open ( dvdcss_t ); -int _dvdcss_close ( dvdcss_t ); - -/***************************************************************************** - * Device reading prototypes, raw-device specific - *****************************************************************************/ -int _dvdcss_raw_open ( dvdcss_t, char const * ); +int dvdcss_use_ioctls ( dvdcss_t ); +void dvdcss_check_device ( dvdcss_t ); +int dvdcss_open_device ( dvdcss_t ); +int dvdcss_close_device ( dvdcss_t ); #endif /* DVDCSS_DEVICE_H */
View file
libdvdcss-1.3.0.tar.bz2/src/dvdcss/dvdcss.h -> libdvdcss-1.4.0.tar.bz2/src/dvdcss/dvdcss.h
Changed
@@ -2,21 +2,21 @@ * \file dvdcss.h * \author Stéphane Borel <stef@via.ecp.fr> * \author Sam Hocevar <sam@zoy.org> + * * \brief The \e libdvdcss public header. * - * This header contains the public types and functions that applications - * using \e libdvdcss may use. + * Public types and functions that describe the API of the \e libdvdcss library. */ /* * Copyright (C) 1998-2008 VideoLAN * - * This program is free software; you can redistribute it and/or modify + * libdvdcss is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * libdvdcss is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -31,6 +31,10 @@ #define DVDCSS_DVDCSS_H 1 #endif +#include <stdint.h> + +#include "version.h" + #ifdef __cplusplus extern "C" { #endif @@ -38,6 +42,17 @@ /** Library instance handle, to be used for each library call. */ typedef struct dvdcss_s* dvdcss_t; +/** Set of callbacks to access DVDs in custom ways. */ +typedef struct dvdcss_stream_cb +{ + /** custom seek callback */ + int ( *pf_seek ) ( void *p_stream, uint64_t i_pos); + /** custom read callback */ + int ( *pf_read ) ( void *p_stream, void *buffer, int i_read); + /** custom vectored read callback */ + int ( *pf_readv ) ( void *p_stream, const void *p_iovec, int i_blocks); +} dvdcss_stream_cb; + /** The block size of a DVD. */ #define DVDCSS_BLOCK_SIZE 2048 @@ -55,6 +70,9 @@ #define DVDCSS_SEEK_KEY (1 << 1) +/** Macro for setting symbol storage-class or visibility. + * Define LIBDVDCSS_IMPORTS before importing this header to get the + * correct DLL storage-class when using \e libdvdcss from MSVC. */ #if defined(LIBDVDCSS_EXPORTS) #define LIBDVDCSS_EXPORT __declspec(dllexport) extern #elif defined(LIBDVDCSS_IMPORTS) @@ -69,7 +87,9 @@ /* * Exported prototypes. */ -LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( char *psz_target ); +LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( const char *psz_target ); +LIBDVDCSS_EXPORT dvdcss_t dvdcss_open_stream( void *p_stream, + dvdcss_stream_cb *p_stream_cb ); LIBDVDCSS_EXPORT int dvdcss_close ( dvdcss_t ); LIBDVDCSS_EXPORT int dvdcss_seek ( dvdcss_t, int i_blocks, @@ -82,7 +102,7 @@ void *p_iovec, int i_blocks, int i_flags ); -LIBDVDCSS_EXPORT char * dvdcss_error ( dvdcss_t ); +LIBDVDCSS_EXPORT const char *dvdcss_error ( const dvdcss_t ); LIBDVDCSS_EXPORT int dvdcss_is_scrambled ( dvdcss_t );
View file
libdvdcss-1.4.0.tar.bz2/src/dvdcss/version.h
Added
@@ -0,0 +1,37 @@ +/* + * This file is part of libdvdcss + * Copyright (C) 2015 VideoLAN + * + * This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +#ifndef DVDCSS_VERSION_H_ +#define DVDCSS_VERSION_H_ + +#define DVDCSS_VERSION_CODE(major, minor, micro) \ + (((major) * 10000) + \ + ((minor) * 100) + \ + ((micro) * 1)) + +#define DVDCSS_VERSION_MAJOR 1 +#define DVDCSS_VERSION_MINOR 4 +#define DVDCSS_VERSION_MICRO 0 + +#define DVDCSS_VERSION_STRING "1.4.0" + +#define DVDCSS_VERSION \ + DVDCSS_VERSION_CODE(DVDCSS_VERSION_MAJOR, DVDCSS_VERSION_MINOR, DVDCSS_VERSION_MICRO) + +#endif /* DVDCSS_VERSION_H_ */
View file
libdvdcss-1.4.0.tar.bz2/src/dvdcss/version.h.in
Added
@@ -0,0 +1,37 @@ +/* + * This file is part of libdvdcss + * Copyright (C) 2015 VideoLAN + * + * This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +#ifndef DVDCSS_VERSION_H_ +#define DVDCSS_VERSION_H_ + +#define DVDCSS_VERSION_CODE(major, minor, micro) \ + (((major) * 10000) + \ + ((minor) * 100) + \ + ((micro) * 1)) + +#define DVDCSS_VERSION_MAJOR @DVDCSS_VERSION_MAJOR@ +#define DVDCSS_VERSION_MINOR @DVDCSS_VERSION_MINOR@ +#define DVDCSS_VERSION_MICRO @DVDCSS_VERSION_MICRO@ + +#define DVDCSS_VERSION_STRING "@DVDCSS_VERSION_MAJOR@.@DVDCSS_VERSION_MINOR@.@DVDCSS_VERSION_MICRO@" + +#define DVDCSS_VERSION \ + DVDCSS_VERSION_CODE(DVDCSS_VERSION_MAJOR, DVDCSS_VERSION_MINOR, DVDCSS_VERSION_MICRO) + +#endif /* DVDCSS_VERSION_H_ */
View file
libdvdcss-1.3.0.tar.bz2/src/error.c -> libdvdcss-1.4.0.tar.bz2/src/error.c
Changed
@@ -5,48 +5,46 @@ * * Author: Sam Hocevar <sam@zoy.org> * - * This library is free software; you can redistribute it and/or modify + * libdvdcss is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, + * libdvdcss is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along - * with this library; if not, write to the Free Software Foundation, Inc., + * with libdvdcss; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *****************************************************************************/ -#include "config.h" - +#include <stdarg.h> #include <stdio.h> -#include <stdlib.h> - -#ifdef HAVE_SYS_PARAM_H -# include <sys/param.h> -#endif - -#ifdef HAVE_LIMITS_H -# include <limits.h> -#endif -#include "dvdcss/dvdcss.h" - -#include "common.h" -#include "css.h" #include "libdvdcss.h" +static void print_message( const char *prefix, const char *psz_string, + va_list args ) +{ + fprintf( stderr, "libdvdcss %s: ", prefix ); + vfprintf( stderr, psz_string, args ); + fprintf( stderr, "\n" ); +} + /***************************************************************************** * Error messages *****************************************************************************/ -void _print_error( dvdcss_t dvdcss, char *psz_string ) +void print_error( dvdcss_t dvdcss, const char *psz_string, ... ) { if( dvdcss->b_errors ) { - fprintf( stderr, "libdvdcss error: %s\n", psz_string ); + va_list args; + + va_start( args, psz_string ); + print_message("error", psz_string, args); + va_end( args ); } dvdcss->psz_error = psz_string; @@ -55,13 +53,14 @@ /***************************************************************************** * Debug messages *****************************************************************************/ -#if 0 -void _print_debug( dvdcss_t dvdcss, char *psz_string ) +void print_debug( const dvdcss_t dvdcss, const char *psz_string, ... ) { if( dvdcss->b_debug ) { - fprintf( stderr, "libdvdcss debug: %s\n", psz_string ); + va_list args; + + va_start( args, psz_string ); + print_message("debug", psz_string, args ); + va_end( args ); } } -#endif -
View file
libdvdcss-1.3.0.tar.bz2/src/ioctl.c -> libdvdcss-1.4.0.tar.bz2/src/ioctl.c
Changed
@@ -12,18 +12,18 @@ * Alex Strelnikov <lelik@os2.ru> * Gildas Bazin <gbazin@netcourrier.com> * - * This library is free software; you can redistribute it and/or modify + * libdvdcss is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, + * libdvdcss is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along - * with this library; if not, write to the Free Software Foundation, Inc., + * with libdvdcss; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *****************************************************************************/ @@ -37,7 +37,7 @@ #include <string.h> /* memcpy(), memset() */ #include <sys/types.h> -#if defined( WIN32 ) +#if defined( _WIN32 ) # include <windows.h> # include <winioctl.h> #elif defined ( __OS2__ ) @@ -64,13 +64,10 @@ #ifdef DVD_STRUCT_IN_DVD_H # include <dvd.h> #endif -#ifdef __BEOS__ +#ifdef __HAIKU__ # include <malloc.h> # include <scsi.h> #endif -#ifdef HPUX_SCTL_IO -# include <sys/scsi.h> -#endif #ifdef SOLARIS_USCSI # include <dlfcn.h> # include <unistd.h> @@ -86,52 +83,26 @@ # include <sys/dcmd_cam.h> #endif +#include "dvdcss/dvdcss.h" #include "common.h" - +#include "css.h" #include "ioctl.h" -/***************************************************************************** - * Local prototypes, BeOS specific - *****************************************************************************/ -#if defined( __BEOS__ ) -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 +#define DVD_CHALLENGE_SIZE 10 /***************************************************************************** - * Local prototypes, Solaris specific + * Local prototypes, OS-specific *****************************************************************************/ -#if defined( SOLARIS_USCSI ) +#if defined( __HAIKU__ ) +static void BeInitRDC ( raw_device_command *, int ); +#elif defined( SOLARIS_USCSI ) static void SolarisInitUSCSI( struct uscsi_cmd *p_sc, int i_type ); static int SolarisSendUSCSI( int fd, struct uscsi_cmd *p_sc ); -#endif - -/***************************************************************************** - * Local prototypes, win32 (aspi) specific - *****************************************************************************/ -#if defined( WIN32 ) +#elif defined( _WIN32 ) static void WinInitSPTD ( SCSI_PASS_THROUGH_DIRECT *, int ); -static void WinInitSSC ( struct SRB_ExecSCSICmd *, int ); -static int WinSendSSC ( int, struct SRB_ExecSCSICmd * ); -#endif - -/***************************************************************************** - * Local prototypes, QNX specific - *****************************************************************************/ -#if defined( __QNXNTO__ ) +#elif defined( __QNXNTO__ ) static void QNXInitCPT ( CAM_PASS_THRU *, int ); -#endif - -/***************************************************************************** - * Local prototypes, OS2 specific - *****************************************************************************/ -#if defined( __OS2__ ) +#elif defined( __OS2__ ) static void OS2InitSDC( struct OS2_ExecSCSICmd *, int ); #endif @@ -162,7 +133,7 @@ *pi_copyright = dvd.cpst; -#elif defined( __BEOS__ ) +#elif defined( __HAIKU__ ) INIT_RDC( GPCMD_READ_DVD_STRUCTURE, 8 ); rdc.command[ 6 ] = i_layer; @@ -172,16 +143,6 @@ *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 ); @@ -207,36 +168,31 @@ *pi_copyright = dvdbs.copyrightProtectionSystemType; -#elif defined( WIN32 ) - if( WIN2K ) /* NT/2k/XP */ - { - INIT_SPTD( GPCMD_READ_DVD_STRUCTURE, 8 ); - - /* When using IOCTL_DVD_READ_STRUCTURE and - DVD_COPYRIGHT_DESCRIPTOR, CopyrightProtectionType - seems to be always 6 ??? - To work around this MS bug we try to send a raw SCSI command - instead (if we've got enough privileges to do so). */ - - sptd.Cdb[ 6 ] = i_layer; - sptd.Cdb[ 7 ] = DVD_STRUCT_COPYRIGHT; - - i_ret = SEND_SPTD( i_fd, &sptd, &tmp ); - - if( i_ret == 0 ) - { - *pi_copyright = p_buffer[ 4 ]; - } - } - else +#elif defined( _WIN32 ) + DWORD tmp; + SCSI_PASS_THROUGH_DIRECT sptd = { 0 }; + uint8_t p_buffer[8]; + sptd.Length = sizeof( SCSI_PASS_THROUGH_DIRECT ); + sptd.DataBuffer = p_buffer; + sptd.DataTransferLength = sizeof( p_buffer ); + WinInitSPTD( &sptd, GPCMD_READ_DVD_STRUCTURE ); + + /* When using IOCTL_DVD_READ_STRUCTURE and + DVD_COPYRIGHT_DESCRIPTOR, CopyrightProtectionType + seems to be always 6 ??? + To work around this MS bug we try to send a raw SCSI command + instead (if we've got enough privileges to do so). */ + + sptd.Cdb[ 6 ] = i_layer; + sptd.Cdb[ 7 ] = DVD_STRUCT_COPYRIGHT; + + i_ret = DeviceIoControl( (HANDLE) i_fd, IOCTL_SCSI_PASS_THROUGH_DIRECT, + &sptd, sizeof( SCSI_PASS_THROUGH_DIRECT ), + &sptd, sizeof( SCSI_PASS_THROUGH_DIRECT ), + &tmp, NULL ) ? 0 : -1; + + if( i_ret == 0 ) { - INIT_SSC( GPCMD_READ_DVD_STRUCTURE, 8 ); - - ssc.CDBByte[ 6 ] = i_layer; - ssc.CDBByte[ 7 ] = DVD_STRUCT_COPYRIGHT; - - i_ret = WinSendSSC( i_fd, &ssc ); - *pi_copyright = p_buffer[ 4 ]; } @@ -273,7 +229,7 @@ /***************************************************************************** * ioctl_ReadDiscKey: get the disc key *****************************************************************************/
View file
libdvdcss-1.3.0.tar.bz2/src/ioctl.h -> libdvdcss-1.4.0.tar.bz2/src/ioctl.h
Changed
@@ -5,12 +5,12 @@ * * Authors: Sam Hocevar <sam@zoy.org> * - * This program is free software; you can redistribute it and/or modify + * libdvdcss is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * libdvdcss is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -23,52 +23,33 @@ #ifndef DVDCSS_IOCTL_H #define DVDCSS_IOCTL_H +#include <stdint.h> + int ioctl_ReadCopyright ( int, int, int * ); -int ioctl_ReadDiscKey ( int, int *, uint8_t * ); -int ioctl_ReadTitleKey ( int, int *, int, uint8_t * ); +int ioctl_ReadDiscKey ( int, const int *, uint8_t * ); +int ioctl_ReadTitleKey ( int, const int *, int, uint8_t * ); int ioctl_ReportAgid ( int, int * ); -int ioctl_ReportChallenge ( int, int *, uint8_t * ); -int ioctl_ReportKey1 ( int, int *, uint8_t * ); -int ioctl_ReportASF ( int, int *, int * ); +int ioctl_ReportChallenge ( int, const int *, uint8_t * ); +int ioctl_ReportKey1 ( int, const int *, uint8_t * ); +int ioctl_ReportASF ( int, int * ); int ioctl_InvalidateAgid ( int, int * ); -int ioctl_SendChallenge ( int, int *, uint8_t * ); -int ioctl_SendKey2 ( int, int *, uint8_t * ); +int ioctl_SendChallenge ( int, const int *, const uint8_t * ); +int ioctl_SendKey2 ( int, const int *, const uint8_t * ); int ioctl_ReportRPC ( int, int *, int *, int * ); -#define DVD_KEY_SIZE 5 -#define DVD_CHALLENGE_SIZE 10 #define DVD_DISCKEY_SIZE 2048 /***************************************************************************** - * Common macro, BeOS specific + * Common macros, OS-specific *****************************************************************************/ -#if defined( __BEOS__ ) +#if defined( __HAIKU__ ) #define INIT_RDC( TYPE, SIZE ) \ raw_device_command rdc = { 0 }; \ uint8_t p_buffer[ (SIZE)+1 ]; \ rdc.data = (char *)p_buffer; \ rdc.data_length = (SIZE); \ 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 = { 0 }; \ - uint8_t p_buffer[ (SIZE)+1 ]; \ - sctl_io.data = (void *)p_buffer; \ - sctl_io.data_length = (SIZE); \ - HPUXInitSCTL( &sctl_io, (TYPE) ); -#endif - -/***************************************************************************** - * Common macro, Solaris specific - *****************************************************************************/ -#if defined( SOLARIS_USCSI ) -#define USCSI_TIMEOUT( SC, TO ) ( (SC)->uscsi_timeout = (TO) ) -#define USCSI_RESID( SC ) ( (SC)->uscsi_resid ) +#elif defined( SOLARIS_USCSI ) #define INIT_USCSI( TYPE, SIZE ) \ struct uscsi_cmd sc = { 0 }; \ union scsi_cdb rs_cdb; \ @@ -77,49 +58,14 @@ sc.uscsi_bufaddr = (caddr_t)p_buffer; \ sc.uscsi_buflen = (SIZE); \ SolarisInitUSCSI( &sc, (TYPE) ); -#endif - -/***************************************************************************** - * Common macro, Darwin specific - *****************************************************************************/ -#if defined( DARWIN_DVD_IOCTL ) +#elif defined( DARWIN_DVD_IOCTL ) #define INIT_DVDIOCTL( DKDVD_TYPE, BUFFER_TYPE, FORMAT ) \ DKDVD_TYPE dvd = { 0 }; \ BUFFER_TYPE dvdbs = { 0 }; \ dvd.format = FORMAT; \ dvd.buffer = &dvdbs; \ dvd.bufferLength = sizeof(dvdbs); -#endif - -/***************************************************************************** - * Common macro, win32 specific - *****************************************************************************/ -#if defined( WIN32 ) -#define INIT_SPTD( TYPE, SIZE ) \ - DWORD tmp; \ - SCSI_PASS_THROUGH_DIRECT sptd = { 0 }; \ - uint8_t p_buffer[ (SIZE) ]; \ - sptd.Length = sizeof( SCSI_PASS_THROUGH_DIRECT ); \ - sptd.DataBuffer = p_buffer; \ - sptd.DataTransferLength = (SIZE); \ - WinInitSPTD( &sptd, (TYPE) ); -#define SEND_SPTD( DEV, SPTD, TMP ) \ - (DeviceIoControl( (HANDLE)(DEV), IOCTL_SCSI_PASS_THROUGH_DIRECT, \ - (SPTD), sizeof( SCSI_PASS_THROUGH_DIRECT ), \ - (SPTD), sizeof( SCSI_PASS_THROUGH_DIRECT ), \ - (TMP), NULL ) ? 0 : -1) -#define INIT_SSC( TYPE, SIZE ) \ - struct SRB_ExecSCSICmd ssc = { 0 }; \ - uint8_t p_buffer[ (SIZE)+1 ]; \ - ssc.SRB_BufPointer = (unsigned char *)p_buffer; \ - ssc.SRB_BufLen = (SIZE); \ - WinInitSSC( &ssc, (TYPE) ); -#endif - -/***************************************************************************** - * Common macro, QNX specific - *****************************************************************************/ -#if defined( __QNXNTO__ ) +#elif defined( __QNXNTO__ ) #define INIT_CPT( TYPE, SIZE ) \ CAM_PASS_THRU * p_cpt = { 0 }; \ uint8_t * p_buffer; \ @@ -129,12 +75,7 @@ p_cpt->cam_data_ptr = sizeof( CAM_PASS_THRU ); \ p_cpt->cam_dxfer_len = (SIZE); \ QNXInitCPT( p_cpt, (TYPE) ); -#endif - -/***************************************************************************** - * Common macro, OS2 specific - *****************************************************************************/ -#if defined( __OS2__ ) +#elif defined( __OS2__ ) #define INIT_SSC( TYPE, SIZE ) \ struct OS2_ExecSCSICmd sdc = { 0 }; \ uint8_t p_buffer[ (SIZE) + 1 ] = { 0 }; \ @@ -146,7 +87,7 @@ #endif /***************************************************************************** - * Additional types, OpenBSD specific + * Additional types, OpenBSD-specific *****************************************************************************/ #if defined( HAVE_OPENBSD_DVD_STRUCT ) typedef union dvd_struct dvd_struct; @@ -180,12 +121,13 @@ #define DVDCSS_INVALIDATE_AGID 0x3f /***************************************************************************** - * win32 ioctl specific + * Win32-ioctl-specific *****************************************************************************/ -#if defined( WIN32 ) +#if defined( _WIN32 ) -#define WIN32_LEAN_AND_MEAN +#define _WIN32_LEAN_AND_MEAN #include <windows.h> +#include <winioctl.h> #define IOCTL_DVD_START_SESSION CTL_CODE(FILE_DEVICE_DVD, 0x0400, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_DVD_READ_KEY CTL_CODE(FILE_DEVICE_DVD, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS) @@ -303,96 +245,10 @@ UCHAR Cdb[16]; } SCSI_PASS_THROUGH_DIRECT, *PSCSI_PASS_THROUGH_DIRECT; -/***************************************************************************** - * win32 aspi specific - *****************************************************************************/ - -typedef DWORD (CALLBACK *GETASPI32SUPPORTINFO)(VOID); -typedef DWORD (CALLBACK *SENDASPI32COMMAND)(LPVOID); - -#define WIN2K ( GetVersion() < 0x80000000 ) -#define ASPI_HAID 0 -#define ASPI_TARGET 0 -#define DTYPE_CDROM 0x05 - -#define SENSE_LEN 0x0E -#define SC_GET_DEV_TYPE 0x01 -#define SC_EXEC_SCSI_CMD 0x02 -#define SC_GET_DISK_INFO 0x06 -#define SS_COMP 0x01 -#define SS_PENDING 0x00 -#define SS_NO_ADAPTERS 0xE8 -#define SRB_DIR_IN 0x08 -#define SRB_DIR_OUT 0x10 -#define SRB_EVENT_NOTIFY 0x40 - -struct w32_aspidev
View file
libdvdcss-1.3.0.tar.bz2/src/libdvdcss.c -> libdvdcss-1.4.0.tar.bz2/src/libdvdcss.c
Changed
@@ -6,18 +6,18 @@ * * Copyright (C) 1998-2008 VideoLAN * - * This library is free software; you can redistribute it and/or modify + * libdvdcss is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This library is distributed in the hope that it will be useful, + * libdvdcss is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along - * with this library; if not, write to the Free Software Foundation, Inc., + * with libdvdcss; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -29,16 +29,16 @@ * \e libdvdcss is a simple library designed for accessing DVDs like a block * device without having to bother about the decryption. The important features * are: - * \li portability: currently supported platforms are GNU/Linux, FreeBSD, - * NetBSD, OpenBSD, BeOS, Windows 98/ME, Windows NT/2000/XP, Mac OS X, - * Solaris, HP-UX and OS/2. - * \li adaptability: unlike most similar projects, libdvdcss doesn't require + * \li portability: Currently supported platforms are GNU/Linux, FreeBSD, + * NetBSD, OpenBSD, Haiku, Mac OS X, Solaris, QNX, OS/2, and Windows + * 2000 or later. + * \li adaptability: Unlike most similar projects, libdvdcss does not require * the region of your drive to be set and will try its best to read from * the disc even in the case of a region mismatch. - * \li simplicity: a DVD player can be built around the \e libdvdcss API using + * \li simplicity: A DVD player can be built around the \e libdvdcss API using * no more than 4 or 5 library calls. * - * \e libdvdcss is free software, released under the General Public License. + * \e libdvdcss is free software, released under the GNU General Public License. * This ensures that \e libdvdcss remains free and used only with free * software. * @@ -53,12 +53,12 @@ * \e libdvdcss without having to modify the program which uses it. These * variables are: * - * \li \b DVDCSS_VERBOSE: sets the verbosity level. + * \li \b DVDCSS_VERBOSE: Sets the verbosity level. * - \c 0 outputs no messages at all. * - \c 1 outputs error messages to stderr. * - \c 2 outputs error messages and debug messages to stderr. * - * \li \b DVDCSS_METHOD: sets the authentication and decryption method + * \li \b DVDCSS_METHOD: Sets the authentication and decryption method * that \e libdvdcss will use to read scrambled discs. Can be one * of \c title, \c key or \c disc. * - \c key is the default method. \e libdvdcss will use a set of @@ -70,19 +70,19 @@ * 64 MB of memory to store temporary data. * - \c title is the fallback when all other methods have failed. It does * not rely on a key exchange with the DVD drive, but rather uses a - * crypto attack to guess the title key. On rare cases this may fail + * crypto attack to guess the title key. In rare cases this may fail * because there is not enough encrypted data on the disc to perform - * a statistical attack, but in the other hand it is the only way to + * a statistical attack, but on the other hand it is the only way to * decrypt a DVD stored on a hard disc, or a DVD with the wrong region * on an RPC2 drive. * - * \li \b DVDCSS_RAW_DEVICE: specify the raw device to use. Exact usage will + * \li \b DVDCSS_RAW_DEVICE: Specify the raw device to use. Exact usage will * depend on your operating system, the Linux utility to set up raw devices * is \c raw(8) for instance. Please note that on most operating systems, * using a raw device requires highly aligned buffers: Linux requires a * 2048 bytes alignment (which is the size of a DVD sector). * - * \li \b DVDCSS_CACHE: specify a directory in which to store title key + * \li \b DVDCSS_CACHE: Specify a directory in which to cache title key * values. This will speed up descrambling of DVDs which are in the * cache. The DVDCSS_CACHE directory is created if it does not exist, * and a subdirectory is created named after the DVD's title or @@ -97,6 +97,7 @@ */ #include "config.h" +#include <limits.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -115,11 +116,8 @@ # include <unistd.h> #endif -#ifdef HAVE_LIMITS_H -# include <limits.h> -#endif - -#if defined(_WIN32_IE) && _WIN32_IE >= 0x500 +#ifdef _WIN32 +# include <windows.h> # include <shlobj.h> #endif @@ -136,115 +134,102 @@ #define mkdir(a, b) _mkdir(a) #endif -/** - * \brief Open a DVD device or directory and return a dvdcss instance. - * - * \param psz_target a string containing the target name, for instance - * "/dev/hdc" or "E:". - * \return a handle to a dvdcss instance or NULL on error. - * - * Initialize the \e libdvdcss library and open the requested DVD device or - * directory. \e libdvdcss checks whether ioctls can be performed on the disc, - * and when possible, the disc key is retrieved. - * - * dvdcss_open() returns a handle to be used for all subsequent \e libdvdcss - * calls. If an error occurred, NULL is returned. - */ -LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( char *psz_target ) -{ - char psz_buffer[PATH_MAX]; - int i_ret; +#define CACHE_TAG_NAME "CACHEDIR.TAG" - char *psz_method = getenv( "DVDCSS_METHOD" ); - char *psz_verbose = getenv( "DVDCSS_VERBOSE" ); - char *psz_cache = getenv( "DVDCSS_CACHE" ); -#ifdef DVDCSS_RAW_OPEN - char *psz_raw_device = getenv( "DVDCSS_RAW_DEVICE" ); -#endif +#define STRING_KEY_SIZE (DVD_KEY_SIZE * 2) +#define INTERESTING_SECTOR 16 +#define DISC_TITLE_OFFSET 40 +#define DISC_TITLE_LENGTH 32 +#define MANUFACTURING_DATE_OFFSET 813 +#define MANUFACTURING_DATE_LENGTH 16 - dvdcss_t dvdcss; - /* - * Allocate the library structure - */ - dvdcss = malloc( sizeof( struct dvdcss_s ) ); - if( dvdcss == NULL ) - { - return NULL; - } +static dvdcss_t dvdcss_open_common ( const char *psz_target, void *p_stream, + dvdcss_stream_cb *p_stream_cb ); +static void set_verbosity( dvdcss_t dvdcss ) +{ + const char *psz_verbose = getenv( "DVDCSS_VERBOSE" ); - /* - * Initialize structure with default values - */ -#ifdef DVDCSS_RAW_OPEN - dvdcss->i_raw_fd = -1; -#endif - dvdcss->p_titles = NULL; - dvdcss->psz_device = (char *)strdup( psz_target ); - dvdcss->psz_error = "no error"; - dvdcss->i_method = DVDCSS_METHOD_KEY; - dvdcss->psz_cachefile[0] = '\0'; - dvdcss->b_debug = 0; + dvdcss->b_debug = 0; dvdcss->b_errors = 0; - /* - * Find verbosity from DVDCSS_VERBOSE environment variable - */ if( psz_verbose != NULL ) { int i = atoi( psz_verbose ); - if( i >= 2 ) dvdcss->b_debug = i; - if( i >= 1 ) dvdcss->b_errors = 1; + if( i >= 2 ) + dvdcss->b_debug = 1; + if( i >= 1 ) + dvdcss->b_errors = 1; } +} + +static int set_access_method( dvdcss_t dvdcss ) +{ + const char *psz_method = getenv( "DVDCSS_METHOD" ); - /* - * Find method from DVDCSS_METHOD environment variable - */ - if( psz_method != NULL ) + if( !psz_method ) + return 0;
View file
libdvdcss-1.3.0.tar.bz2/src/libdvdcss.h -> libdvdcss-1.4.0.tar.bz2/src/libdvdcss.h
Changed
@@ -6,12 +6,12 @@ * Authors: Stéphane Borel <stef@via.ecp.fr> * Sam Hocevar <sam@zoy.org> * - * This program is free software; you can redistribute it and/or modify + * libdvdcss is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * libdvdcss is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -24,11 +24,21 @@ #ifndef DVDCSS_LIBDVDCSS_H #define DVDCSS_LIBDVDCSS_H +#include <limits.h> + #include "dvdcss/dvdcss.h" #include "css.h" #include "device.h" /***************************************************************************** + * libdvdcss method: used like init flags + *****************************************************************************/ +enum dvdcss_method { + DVDCSS_METHOD_KEY, + DVDCSS_METHOD_DISC, + DVDCSS_METHOD_TITLE, +}; +/***************************************************************************** * The libdvdcss structure *****************************************************************************/ struct dvdcss_s @@ -36,74 +46,43 @@ /* File descriptor */ char * psz_device; int i_fd; - int i_read_fd; int i_pos; /* File handling */ int ( * pf_seek ) ( dvdcss_t, int ); int ( * pf_read ) ( dvdcss_t, void *, int ); - int ( * pf_readv ) ( dvdcss_t, struct iovec *, int ); + int ( * pf_readv ) ( dvdcss_t, const struct iovec *, int ); /* Decryption stuff */ - int i_method; - css_t css; + enum dvdcss_method i_method; + struct css css; int b_ioctls; int b_scrambled; - dvd_title_t *p_titles; + struct dvd_title *p_titles; /* Key cache directory and pointer to the filename */ char psz_cachefile[PATH_MAX]; char * psz_block; /* Error management */ - char * psz_error; + const char *psz_error; int b_errors; int b_debug; -#ifdef WIN32 +#ifdef _WIN32 int b_file; char * p_readv_buffer; int i_readv_buf_size; -#endif +#endif /* _WIN32 */ -#ifdef DVDCSS_RAW_OPEN - int i_raw_fd; -#endif + void *p_stream; + dvdcss_stream_cb *p_stream_cb; }; /***************************************************************************** - * libdvdcss method: used like init flags - *****************************************************************************/ -#define DVDCSS_METHOD_KEY 0 -#define DVDCSS_METHOD_DISC 1 -#define DVDCSS_METHOD_TITLE 2 - -/***************************************************************************** * Functions used across the library *****************************************************************************/ -#define print_error(dvdcss,msg) _print_error(dvdcss,msg) -#if defined( _MSC_VER ) -#include <stdarg.h> -__forceinline void print_debug(dvdcss_t dvdcss, const char *msg,...) -{ - va_list args; - - fprintf( stderr, "libdvdcss debug: " ); - va_start( args, msg ); - vfprintf( stderr, msg, args ); - va_end( args ); - fprintf( stderr, "\n" ); -} -#else -#define print_debug(dvdcss,msg,args...) \ - if( dvdcss->b_debug ) \ - { \ - fprintf( stderr, "libdvdcss debug: " ); \ - fprintf( stderr, msg, ##args ); \ - fprintf( stderr, "\n" ); \ - } -#endif - -void _print_error ( dvdcss_t, char * ); +void print_error ( dvdcss_t, const char *, ... ); +void print_debug ( const dvdcss_t, const char *, ... ); #endif /* DVDCSS_LIBDVDCSS_H */
View file
libdvdcss-1.3.0.tar.bz2/test/csstest.c -> libdvdcss-1.4.0.tar.bz2/test/csstest.c
Changed
@@ -124,4 +124,3 @@ for( ; i_amount ; i_amount--, p_buffer++ ) printf( "%.2x", *p_buffer ); printf( "...\n" ); } -
View file
libdvdcss-1.3.0.tar.bz2/test/dvd_region.c -> libdvdcss-1.4.0.tar.bz2/test/dvd_region.c
Changed
@@ -12,7 +12,6 @@ #include <stdlib.h> #include <string.h> #include <sys/types.h> -#include <sys/stat.h> #include <fcntl.h> #include <getopt.h> @@ -21,6 +20,10 @@ #include "config.h" #include "common.h" #include "ioctl.h" +#include "libdvdcss.h" + +/* On non-Linux platforms static functions from ioctl.c are used. */ +#include "ioctl.c" #define DEFAULT_DEVICE "/dev/dvd" @@ -31,6 +34,10 @@ { int i_ret; + /* Shut up warnings about unused parameters. */ + (void)i_fd; + (void)i_pdrc; + #if defined( HAVE_LINUX_DVD_STRUCT ) && defined( DVD_HOST_SEND_RPC_STATE ) dvd_authinfo auth_info = { 0 }; @@ -51,7 +58,7 @@ i_ret = ioctl( i_fd, DVDIOCSENDKEY, &auth_info ); -#elif defined( __BEOS__ ) +#elif defined( __HAIKU__ ) INIT_RDC( GPCMD_SEND_KEY, 8 ); rdc.command[ 10 ] = DVD_SEND_RPC; @@ -61,16 +68,6 @@ i_ret = ioctl( i_fd, B_RAW_DEVICE_COMMAND, &rdc, sizeof(rdc) ); -#elif defined( HPUX_SCTL_IO ) - INIT_SCTL_IO( GPCMD_SEND_KEY, 8 ); - - sctl_io.cdb[ 10 ] = DVD_SEND_RPC; - - p_buffer[ 1 ] = 6; - p_buffer[ 4 ] = i_pdrc; - - i_ret = ioctl( i_fd, SIOC_IO, &sctl_io ); - #elif defined( SOLARIS_USCSI ) INIT_USCSI( GPCMD_SEND_KEY, 8 ); @@ -95,29 +92,24 @@ i_ret = ioctl( i_fd, DKIOCDVDSENDKEY, &dvd ); -#elif defined( WIN32 ) - if( WIN2K ) /* NT/2k/XP */ - { - INIT_SPTD( GPCMD_SEND_KEY, 8 ); - - sptd.Cdb[ 10 ] = DVD_SEND_RPC; - - p_buffer[ 1 ] = 6; - p_buffer[ 4 ] = i_pdrc; +#elif defined( _WIN32 ) + DWORD tmp; + SCSI_PASS_THROUGH_DIRECT sptd = { 0 }; + uint8_t p_buffer[8]; + sptd.Length = sizeof( SCSI_PASS_THROUGH_DIRECT ); + sptd.DataBuffer = p_buffer; + sptd.DataTransferLength = sizeof( p_buffer ); + WinInitSPTD( &sptd, GPCMD_SEND_KEY ); - i_ret = SEND_SPTD( i_fd, &sptd, &tmp ); - } - else - { - INIT_SSC( GPCMD_SEND_KEY, 8 ); - - ssc.CDBByte[ 10 ] = DVD_SEND_RPC; + sptd.Cdb[ 10 ] = DVD_SEND_RPC; - p_buffer[ 1 ] = 6; - p_buffer[ 4 ] = i_pdrc; + p_buffer[ 1 ] = 6; + p_buffer[ 4 ] = i_pdrc; - i_ret = WinSendSSC( i_fd, &ssc ); - } + i_ret = DeviceIoControl( (HANDLE) i_fd, IOCTL_SCSI_PASS_THROUGH_DIRECT, + &sptd, sizeof( SCSI_PASS_THROUGH_DIRECT ), + &sptd, sizeof( SCSI_PASS_THROUGH_DIRECT ), + &tmp, NULL ) ? 0 : -1; #elif defined( __QNXNTO__ ) @@ -157,9 +149,10 @@ printf("Invalid region( %d)\n", region); return 1; } - printf("Setting drive region can only be done a finite " \ + printf("Setting drive region can only be done a finite " "number of times, press Ctrl-C now to cancel!\n"); - getchar(); + /* Discard returned character, just wait for any key as confirmation. */ + (void) getchar(); region_mask = 0xff & ~(1 << (region - 1)); printf("Setting region to %d( %x)\n", region, region_mask); @@ -176,7 +169,7 @@ int type, region_mask, rpc_scheme; int region = 1; int ret; - + printf("Drive region info:\n"); if( (ret = ioctl_ReportRPC(fd, &type, ®ion_mask, &rpc_scheme)) < 0) { @@ -193,25 +186,23 @@ printf("Drive region is set\n"); break; case 2: - printf("Drive region is set, with additional " \ - "restrictions required to make a change\n"); + printf("Drive region is set, with additional " + "restrictions required to make a change\n"); break; case 3: - printf("Drive region has been set permanently, but " \ - "may be reset by the vendor if necessary\n"); + printf("Drive region has been set permanently, but " + "may be reset by the vendor if necessary\n"); break; default: printf("Invalid( %x)\n", type); break; } - // printf("%d vendor resets available\n", ai->lrpcs.vra); - // printf("%d user controlled changes available\n", ai->lrpcs.ucca); printf("Region: "); if( region_mask) while(region_mask) { if( !(region_mask & 1) ) - printf("%d playable\n", region); + printf("%d playable\n", region); region++; region_mask >>= 1; } @@ -221,13 +212,14 @@ printf("RPC Scheme: "); switch( rpc_scheme ) { case 0: - printf("The Logical Unit does not enforce Region " \ - "Playback Controls( RPC)\n"); + printf("The Logical Unit does not enforce Regional " + "Playback Control (RPC).\n"); break; case 1: printf("The Logical Unit _shall_ adhere to the " - "specification and all requirements of the " \ - "CSS license agreement concerning RPC\n"); + "specification and all requirements of the " + "Content Scrambling System (CSS) license " + "agreement concerning RPC.\n"); break; default: printf("Reserved( %x)\n", rpc_scheme); @@ -238,14 +230,15 @@ static void usage(void) { - fprintf( stderr, - "Usage: dvd_region [ -d device ] [ [ -s ] [ -r region ] ]\n" ); -} + fprintf( stderr, + "Usage: dvd_region [ -d device ] [ [ -s ] [ -r region ] ]\n" ); +} int main(int argc, char *argv[]) { char device_name[FILENAME_MAX], c, set, region = 0; - int fd, ret; + int ret; + dvdcss_t dvdcss; strcpy(device_name, DEFAULT_DEVICE); set = 0; @@ -276,21 +269,18 @@ return -1; } - /* TODO: use dvdcss_open instead of open */ - - if( (fd = open(device_name, O_RDONLY | O_NONBLOCK)) < 0 ) {
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.