From f9a72d221225dec5e10b1ee63a33875eea7ae8a8 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Sat, 25 Dec 2010 22:16:25 +0100 Subject: [PATCH 1/2] Add libcurl dependency information --- README | 1 + contrib/centos.spec | 2 +- contrib/fedora-core.spec | 2 +- contrib/opensuse-10.spec | 2 +- debian-upstream/control | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README b/README index ca4a8c3c9..98e9e1ea5 100644 --- a/README +++ b/README @@ -68,6 +68,7 @@ libraries you absolutely need are: - zlib ( http://www.zlib.net/ ) -- a compression library - Several of Boost's libraries: "format", "RegEx", "filesystem", "system", "foreach" ( http://www.boost.org/ ) +- libcurl ( http://curl.haxx.se/ ) for online update checks You also need the "rake" or "drake" build program or at least the programming language Ruby and the "rubygems" package. MKVToolNix comes diff --git a/contrib/centos.spec b/contrib/centos.spec index 82817f976..1caeb6930 100644 --- a/contrib/centos.spec +++ b/contrib/centos.spec @@ -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. diff --git a/contrib/fedora-core.spec b/contrib/fedora-core.spec index 73bf6bb79..baa54fa83 100644 --- a/contrib/fedora-core.spec +++ b/contrib/fedora-core.spec @@ -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. diff --git a/contrib/opensuse-10.spec b/contrib/opensuse-10.spec index 3bd931309..6edb8feae 100644 --- a/contrib/opensuse-10.spec +++ b/contrib/opensuse-10.spec @@ -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/ diff --git a/debian-upstream/control b/debian-upstream/control index 3685e3462..471488625 100644 --- a/debian-upstream/control +++ b/debian-upstream/control @@ -2,7 +2,7 @@ Source: mkvtoolnix Section: graphics Priority: optional Maintainer: Moritz Bunkus -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 From 5474994b781faa9391e5075e0ba4f1a6983c56bc Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Sat, 25 Dec 2010 23:56:28 +0100 Subject: [PATCH 2/2] Moved libcurl from the required to the optional components --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 98e9e1ea5..8383eb9df 100644 --- a/README +++ b/README @@ -68,7 +68,6 @@ libraries you absolutely need are: - zlib ( http://www.zlib.net/ ) -- a compression library - Several of Boost's libraries: "format", "RegEx", "filesystem", "system", "foreach" ( http://www.boost.org/ ) -- libcurl ( http://curl.haxx.se/ ) for online update checks You also need the "rake" or "drake" build program or at least the programming language Ruby and the "rubygems" package. MKVToolNix comes @@ -98,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