Merge branch 'master' of file:///home/mosu/prog/video/mkvtoolnix

This commit is contained in:
Moritz Bunkus 2010-12-26 00:09:36 +01:00
commit 9c1c31dd5e
5 changed files with 5 additions and 4 deletions

1
README
View File

@ -97,6 +97,7 @@ built. These include:
aforementioned zlib is what every program supports.
- libMagic from the "file" package ( http://www.darwinsys.com/file/ )
for automatic content type detection
- libcurl ( http://curl.haxx.se/ ) for online update checks
2.3. Building libmatroska and libebml

View File

@ -10,7 +10,7 @@ Source: %{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-tmproot
BuildRequires: libebml-devel >= 1.0.0
BuildRequires: libmatroska-devel >= 1.0.0
BuildRequires: gcc-c++ gcc gcc-c++ make libogg-devel libvorbis-devel wxGTK-devel >= 2.8 boost-devel file lzo-devel bzip2-devel zlib-devel expat-devel gettext-devel ruby
BuildRequires: gcc-c++ gcc gcc-c++ make libogg-devel libvorbis-devel wxGTK-devel >= 2.8 boost-devel file lzo-devel bzip2-devel zlib-devel expat-devel gettext-devel ruby curl-devel
%description
Matroska video utilities.

View File

@ -10,7 +10,7 @@ Source: %{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-tmproot
BuildRequires: libebml-devel >= 1.0.0
BuildRequires: libmatroska-devel >= 1.0.0
BuildRequires: gcc-c++ gcc gcc-c++ make flac-devel libogg-devel libvorbis-devel wxGTK-devel >= 2.8 boost-devel file lzo-devel bzip2-devel zlib-devel expat-devel gettext-devel ruby
BuildRequires: gcc-c++ gcc gcc-c++ make flac-devel libogg-devel libvorbis-devel wxGTK-devel >= 2.8 boost-devel file lzo-devel bzip2-devel zlib-devel expat-devel gettext-devel ruby libcurl-devel
%description
Matroska video utilities.

View File

@ -4,7 +4,7 @@
BuildRequires: libebml >= 1.0.0
BuildRequires: libmatroska >= 1.0.0
BuildRequires: expat flac flac-devel gcc-c++ gtk2 gtk2-devel libogg libogg-devel libstdc++-devel libvorbis libvorbis-devel lzo lzo-devel pkgconfig wxGTK >= 2.6 wxGTK-devel >= 2.6 wxGTK-gl boost-devel file-devel ruby
BuildRequires: expat flac flac-devel gcc-c++ gtk2 gtk2-devel libogg libogg-devel libstdc++-devel libvorbis libvorbis-devel lzo lzo-devel pkgconfig wxGTK >= 2.6 wxGTK-devel >= 2.6 wxGTK-gl boost-devel file-devel ruby libcurl-devel
Name: mkvtoolnix
URL: http://www.bunkus.org/videotools/mkvtoolnix/

View File

@ -2,7 +2,7 @@ Source: mkvtoolnix
Section: graphics
Priority: optional
Maintainer: Moritz Bunkus <moritz@bunkus.org>
Build-Depends: debhelper (>> 4.0.0), libebml-dev (>= 1.0.0-1), libmatroska-dev (>= 1.0.0-1), libogg-dev, libvorbis-dev, libwxgtk2.6-dev | libwxgtk2.8-dev, libexpat1-dev, zlib1g-dev, liblzo-dev | liblzo2-dev, libbz2-dev, libflac-dev, libmagic-dev, libboost-dev (>= 1.34), libboost-regex-dev, libboost-filesystem-dev, libboost-filesystem-dev (<< 1.35) | libboost-system-dev, ruby
Build-Depends: debhelper (>> 4.0.0), libebml-dev (>= 1.0.0-1), libmatroska-dev (>= 1.0.0-1), libogg-dev, libvorbis-dev, libwxgtk2.6-dev | libwxgtk2.8-dev, libexpat1-dev, zlib1g-dev, liblzo-dev | liblzo2-dev, libbz2-dev, libflac-dev, libmagic-dev, libboost-dev (>= 1.34), libboost-regex-dev, libboost-filesystem-dev, libboost-filesystem-dev (<< 1.35) | libboost-system-dev, ruby, libcurl4-gnutls-dev | libcurl4-openssl-dev
Standards-Version: 3.7.2
Package: mkvtoolnix