Репозитории ALT
| S: | 1.3.0-alt1 |
| 5.1: | 1.2.10-alt1 |
| 4.1: | 1.2.9-alt1 |
| 4.0: | 1.2.9-alt1 |
| 3.0: | 1.2.8-alt1 |
Группа :: Система/Библиотеки
Пакет: libdvdcss
навигация по пакетам
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: libdvdcss-1.3.0-alt1.patch
Скачать
Скачать
.gear/rules | 2 +
.../tags/001b66afe807e2b1206879550b629269b565968e | 11 +
.gear/tags/list | 1 +
Makefile.am | 6 +-
libdvdcss.spec | 231 +++++++--------------
src/libdvdcss.c | 10 +-
6 files changed, 101 insertions(+), 160 deletions(-)
diff --git a/.gear/rules b/.gear/rules
new file mode 100644
index 0000000..4fcfd99
--- /dev/null
+++ b/.gear/rules
@@ -0,0 +1,2 @@
+tar: @version@:.
+diff: @version@:. .
diff --git a/.gear/tags/001b66afe807e2b1206879550b629269b565968e b/.gear/tags/001b66afe807e2b1206879550b629269b565968e
new file mode 100644
index 0000000..e59f4f1
--- /dev/null
+++ b/.gear/tags/001b66afe807e2b1206879550b629269b565968e
@@ -0,0 +1,11 @@
+object b7967b94d3fe8159325269091dedc8b769339cea
+type commit
+tag 1.3.0
+tagger Jean-Baptiste Kempf <jb@videolan.org> 1407196342 +0200
+
+libdvdcss 1.3.0
+
+This is a major release of libdvdcss.
+
+It adds support for Android, updates the Windows support,
+cleans the code, remove deprecated APIs and updates the documentation
diff --git a/.gear/tags/list b/.gear/tags/list
new file mode 100644
index 0000000..1455221
--- /dev/null
+++ b/.gear/tags/list
@@ -0,0 +1 @@
+001b66afe807e2b1206879550b629269b565968e 1.3.0
diff --git a/Makefile.am b/Makefile.am
index 15002e9..c60d5c9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,9 +2,9 @@ ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = msvc libdvdcss.spec doc/header.html doc/footer.html INSTALL
-dist_doc_DATA = AUTHORS COPYING NEWS README ChangeLog
+dist_doc_DATA = AUTHORS COPYING NEWS README
-MAINTAINERCLEANFILES = ChangeLog
+MAINTAINERCLEANFILES =
ChangeLog: $(wildcard $(srcdir)/.git/logs/HEAD)
-cd $(srcdir) && git log > $(abs_builddir)/$(@)-tmp
@@ -44,7 +44,7 @@ dvd_region_LDADD = libdvdcss.la
dvd_region_CFLAGS = -I $(top_srcdir)/src
pkgincludedir = $(includedir)/dvdcss
-pkginclude_HEADERS = src/dvdcss/dvdcss.h
+pkginclude_HEADERS = src/dvdcss/dvdcss.h src/css.h
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = src/libdvdcss.pc
diff --git a/libdvdcss.spec b/libdvdcss.spec
index 0567388..bb8b989 100644
--- a/libdvdcss.spec
+++ b/libdvdcss.spec
@@ -1,181 +1,108 @@
-%define name libdvdcss
-%define version 1.2.9
-%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}-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
+Name: libdvdcss
+Version: 1.3.0
+Release: alt1
+Summary: A portable abstraction library for DVD decryption
+License: GPL
+Group: System/Libraries
+Url: http://www.videolan.org/developers/libdvdcss.html
+
+Packager: Valery Inozemtsev <shrek@altlinux.ru>
+
+Source: %name-%version.tar
+Patch: %name-%version-%release.patch
+
+BuildRequires: doxygen
%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
- 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.
-
-%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, 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
- 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.
-
-%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'll also need to have the %{name}-package installed.
+This is a portable abstraction library for DVD decryption.
+
+libdvdcss is part of the VideoLAN project, a full MPEG2 client/server
+solution. The VideoLAN Client can also be used as a standalone program
+to play MPEG2 streams from a hard disk or a DVD.
+
+%package devel
+Summary: Development environment for %name
+Group: Development/C
+Requires: %name = %version-%release
+
+%description devel
+This package contains development files required for building
+%name-based software.
%prep
%setup -q
+%patch -p1
%build
-%configure2_5x
-%make
+%autoreconf
+%configure \
+ --disable-static
+%make_build
%install
-%makeinstall_std
+%make DESTDIR=%buildroot install
-%clean
-[ %buildroot != "/" ] && rm -Rf %buildroot
+%files
+%doc AUTHORS NEWS README
+%_libdir/*.so.*
-%post -n %{libname} -p /sbin/ldconfig-
-%postun -n %{libname} -p /sbin/ldconfig-
-%files -n %{libname}-%defattr(-,root,root)
-%doc AUTHORS COPYING NEWS
-%{_libdir}/*.so.*-
-%files -n %{libname}-devel-%defattr(-,root,root)
-%doc ChangeLog COPYING
-%{_libdir}/*.a-%{_libdir}/*.so-%{_libdir}/*.la-%{_includedir}/*+%files devel
+%doc doc/html/*
+%_includedir/*
+%_libdir/*.so
+%_pkgconfigdir/*.pc
%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
+* Sun Oct 26 2014 Valery Inozemtsev <shrek@altlinux.ru> 1.3.0-alt1
+- 1.3.0
-* 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
+* Sun Feb 24 2013 Valery Inozemtsev <shrek@altlinux.ru> 1.2.12-alt1
+- 1.2.12
-* 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
+* Fri Nov 05 2010 Valery Inozemtsev <shrek@altlinux.ru> 1.2.10-alt2
+- rebuild
-* Thu Nov 14 2002 Alexis de Lattre <alexis@videolan.org> 1.2.4-1
-- new upstream release
-- fixes for Win32
+* Sun Dec 21 2008 Valery Inozemtsev <shrek@altlinux.ru> 1.2.10-alt1
+- 1.2.10
-* 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
+* Mon May 08 2006 Valery Inozemtsev <shrek@altlinux.ru> 1.2.9-alt1
+- 1.2.9
+- updated build dependencies
-* 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
+* Thu Nov 27 2003 Yuri N. Sedunov <aris@altlinux.ru> 1.2.8-alt1
+- new version.
+- don't package .la files.
-* 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
+* Thu Apr 24 2003 Yuri N. Sedunov <aris@altlinux.ru> 1.2.6-alt2
+- More headers for MPlayer build.
-* Mon May 20 2002 Sam Hocevar <sam@zoy.org> 1.2.0-1
-- new upstream release
-- weird libxalf dependency is gone
+* Wed Mar 12 2003 Yuri N. Sedunov <aris@altlinux.ru> 1.2.6-alt1
+- 1.2.6
-* 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 CVS's one (%%description,%%files, conflicts).
-- fix URL
+* Tue Feb 04 2003 Yuri N. Sedunov <aris@altlinux.ru> 1.2.5-alt1
+- 1.2.5
-* Sat Apr 06 2002 Guillaume Rousse <rousse@ccr.jussieu.fr> 1.1.1-1plf
-- 1.1.1
+* Sat Nov 16 2002 Yuri N. Sedunov <aris@altlinux.ru> 1.2.4-alt1
+- 1.2.4
-* Wed Jan 30 2002 Guillaume Rousse <rousse@ccr.jussieu.fr> 1.0.0-3plf
-- new plf extension
+* Fri Nov 01 2002 Yuri N. Sedunov <aris@altlinux.ru> 1.2.3-alt1
+- 1.2.3
-* Wed Dec 05 2001 Guillaume Rousse <g.rousse@linux-mandrake.com> 1.0.0-3mdk
-- removed conflict
+* Mon Sep 16 2002 Rider <rider@altlinux.ru> 1.2.2-alt1
+- 1.2.2
-* 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
+* Mon Jun 03 2002 Yuri N. Sedunov <aris@altlinux.ru> 1.2.1-alt1
+- 1.2.1
-* Fri Nov 30 2001 Yves Duret <yduret@mandrakesoft.com> 1.0.0-1mdk
-- version 1.0.0
+* Sun May 26 2002 Yuri N. Sedunov <aris@altlinux.ru> 1.2.0-alt1
+- 1.2.0
-* Thu Aug 23 2001 Yves Duret <yduret@mandrakesoft.com> 0.0.3-1mdk
-- version 0.0.3
+* Wed Sep 19 2001 Dmitry V. Levin <ldv@altlinux.ru> 0.0.3-alt2
+- Specfile major cleanup (policy enforcement).
-* Mon Aug 13 2001 Yves Duret <yduret@mandrakesoft.com> 0.0.2-1mdk
-- version 0.0.2
+* Tue Sep 17 2001 Rider <rider@altlinux.ru> 0.0.3-alt1
+- 0.0.3
+- devel, devel-static package
-* Tue Jun 19 2001 Yves Duret <yduret@mandrakesoft.com> 0.0.1-1mdk
-- first release and first mdk release
+* Thu Sep 6 2001 Martin NorbДck <d95mback@dtek.chalmers.se>
+- initial version
diff --git a/src/libdvdcss.c b/src/libdvdcss.c
index 6c4befc..78306a6 100644
--- a/src/libdvdcss.c
+++ b/src/libdvdcss.c
@@ -87,7 +87,7 @@
* cache. The DVDCSS_CACHE directory is created if it does not exist,
* and a subdirectory is created named after the DVD's title or
* manufacturing date. If DVDCSS_CACHE is not set or is empty, \e libdvdcss
- * will use the default value which is "${HOME}/.dvdcss/" under Unix and+ * will use the default value which is "${TMPDIR}/dvdcss/" under Unix and* "C:\Documents and Settings\$USER\Application Data\dvdcss\" under Win32.
* The special value "off" disables caching.
*/
@@ -244,7 +244,7 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( char *psz_target )
}
#else
char *psz_home = NULL;
-# ifdef HAVE_PWD_H
+# if 0
struct passwd *p_pwd;
/* Try looking in password file for home dir. */
@@ -257,14 +257,14 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( char *psz_target )
if( psz_home == NULL )
{- psz_home = getenv( "HOME" );
+ psz_home = getenv( "TMPDIR" );
}
if( psz_home == NULL )
{psz_home = getenv( "USERPROFILE" );
}
- /* Cache our keys in ${HOME}/.dvdcss/ */+ /* Cache our keys in ${TMPDIR}/.dvdcss/ */if( psz_home )
{int home_pos = 0;
@@ -285,7 +285,7 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( char *psz_target )
}
#endif
snprintf( psz_buffer + home_pos, PATH_MAX - home_pos,
- "%s/.dvdcss", psz_home );
+ "%s/dvdcss", psz_home );
psz_buffer[PATH_MAX-1] = '\0';
psz_cache = psz_buffer;
}