rpms/mkvtoolnix/devel mkvtoolnix-compile.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 mkvtoolnix.spec, 1.25, 1.26 sources, 1.10, 1.11

Sun Mar 1 09:37:05 UTC 2009

Author: rathann

Update of /cvs/pkgs/rpms/mkvtoolnix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28345

Modified Files:
	.cvsignore mkvtoolnix.spec sources 
Added Files:
	mkvtoolnix-compile.patch 
Log Message:
* Sun Mar 01 2009 Dominik Mierzejewski <rpm at greysector.net> 2.5.2-1
- updated to 2.5.2
- fix compilation
- include translated messages


mkvtoolnix-compile.patch:

--- NEW FILE mkvtoolnix-compile.patch ---
diff -up mkvtoolnix-2.5.2/src/tools/diracparser.cpp.compile mkvtoolnix-2.5.2/src/tools/diracparser.cpp
--- mkvtoolnix-2.5.2/src/tools/diracparser.cpp.compile	2009-03-01 10:17:27.000000000 +0100
+++ mkvtoolnix-2.5.2/src/tools/diracparser.cpp	2009-03-01 10:16:58.000000000 +0100
@@ -6,6 +6,7 @@
 #include "common.h"
 #include "mm_io.h"
 #include "dirac_common.h"
+#include "translation.h"
 
 static bool g_opt_checksum         = false;
 static bool g_opt_sequence_headers = false;
diff -up mkvtoolnix-2.5.2/src/tools/ebml_validator.cpp.compile mkvtoolnix-2.5.2/src/tools/ebml_validator.cpp
--- mkvtoolnix-2.5.2/src/tools/ebml_validator.cpp.compile	2009-02-28 15:11:55.000000000 +0100
+++ mkvtoolnix-2.5.2/src/tools/ebml_validator.cpp	2009-03-01 10:18:48.000000000 +0100
@@ -15,6 +15,7 @@
 #include "mm_io.h"
 
 #include "element_info.h"
+#include "translation.h"
 
 static int64_t g_start = 0;
 static int64_t g_end   = std::numeric_limits<long long>::max();
diff -up mkvtoolnix-2.5.2/src/tools/Makefile.compile mkvtoolnix-2.5.2/src/tools/Makefile
--- mkvtoolnix-2.5.2/src/tools/Makefile.compile	2009-03-01 10:12:15.000000000 +0100
+++ mkvtoolnix-2.5.2/src/tools/Makefile	2009-03-01 10:19:19.000000000 +0100
@@ -10,26 +10,26 @@ vc1parser_OBJECTS = $(patsubst %.cpp,%.o
 vc1parser_DEPENDENCIES = $(DEP_COMMON)
 vc1parser_LDADD = -lmtxcommon $(MAGIC_LIBS) -lmatroska -lebml \
 		-lz $(COMPRESSION_LIBRARIES) -lexpat $(ICONV_LIBS) \
-		$(LIBINTL_LIBS) $(LIBRPCRT)
+		$(LIBINTL_LIBS) $(LIBRPCRT) $(BOOST_REGEX_LIB)
 
 diracparser_SOURCES = src/tools/diracparser.cpp
 diracparser_OBJECTS = $(patsubst %.cpp,%.o,$(diracparser_SOURCES))
 diracparser_DEPENDENCIES = $(DEP_COMMON)
 diracparser_LDADD = -lmtxcommon $(MAGIC_LIBS) -lmatroska -lebml \
 		-lz $(COMPRESSION_LIBRARIES) -lexpat $(ICONV_LIBS) \
-		$(LIBINTL_LIBS) $(LIBRPCRT)
+		$(LIBINTL_LIBS) $(LIBRPCRT) $(BOOST_REGEX_LIB)
 
 base64tool_SOURCES = src/tools/base64tool.cpp
 base64tool_OBJECTS = $(patsubst %.cpp,%.o,$(base64tool_SOURCES))
 base64tool_DEPENDENCIES += $(DEP_COMMON)
-base64tool_LDADD = -lmtxcommon $(MAGIC_LIBS) -lexpat $(ICONV_LIBS) $(LIBINTL_LIBS) $(LIBRPCRT)
+base64tool_LDADD = -lmtxcommon $(MAGIC_LIBS) -lexpat $(ICONV_LIBS) $(LIBINTL_LIBS) $(LIBRPCRT) $(BOOST_REGEX_LIB)
 
 ebml_validator_SOURCES = src/tools/ebml_validator.cpp src/tools/element_info.cpp
 ebml_validator_OBJECTS = $(patsubst %.cpp,%.o,$(ebml_validator_SOURCES))
 ebml_validator_DEPENDENCIES = $(DEP_COMMON)
 ebml_validator_LDADD = -lmtxcommon $(MAGIC_LIBS) -lmatroska -lebml \
 		-lz $(COMPRESSION_LIBRARIES) -lexpat $(ICONV_LIBS) \
-		$(LIBINTL_LIBS) $(LIBRPCRT)
+		$(LIBINTL_LIBS) $(LIBRPCRT) $(BOOST_REGEX_LIB)
 
 
 base64tool: src/tools/base64tool$(EXEEXT)
diff -up mkvtoolnix-2.5.2/src/tools/vc1parser.cpp.compile mkvtoolnix-2.5.2/src/tools/vc1parser.cpp
--- mkvtoolnix-2.5.2/src/tools/vc1parser.cpp.compile	2009-02-28 15:11:55.000000000 +0100
+++ mkvtoolnix-2.5.2/src/tools/vc1parser.cpp	2009-03-01 10:17:56.000000000 +0100
@@ -6,6 +6,7 @@
 #include "common.h"
 #include "mm_io.h"
 #include "vc1_common.h"
+#include "translation.h"
 
 static bool g_opt_checksum         = false;
 static bool g_opt_entrypoints      = false;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	27 Feb 2009 02:09:12 -0000	1.10
+++ .cvsignore	1 Mar 2009 09:36:35 -0000	1.11
@@ -1 +1 @@
-mkvtoolnix-2.5.1.tar.bz2
+mkvtoolnix-2.5.2.tar.bz2


Index: mkvtoolnix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/mkvtoolnix.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mkvtoolnix.spec	28 Feb 2009 18:04:54 -0000	1.25
+++ mkvtoolnix.spec	1 Mar 2009 09:36:35 -0000	1.26
@@ -1,12 +1,15 @@
 Summary: Matroska container manipulation utilities
 Name: mkvtoolnix
-Version: 2.5.1
+Version: 2.5.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source0: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2
 Source1: mmg.desktop
 Source2: mkvinfo.desktop
+# https://www.bunkus.org/bugzilla/show_bug.cgi?id=348
+Patch0: %{name}-compile.patch
+# https://www.bunkus.org/bugzilla/show_bug.cgi?id=347
 Patch4: %{name}-ppc64.patch
 URL: http://www.bunkus.org/videotools/mkvtoolnix/index.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
@@ -14,7 +17,7 @@
 BuildRequires: desktop-file-utils
 BuildRequires: file-devel
 BuildRequires: flac-devel >= 1.1.1
-BuildRequires: gettext-devel
+BuildRequires: gettext
 BuildRequires: libmatroska-devel >= 0.8.1
 BuildRequires: libvorbis-devel
 BuildRequires: pcre-devel
@@ -39,6 +42,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .compile
 %patch4 -p1 -b .ppc64
 sed -i -e 's/"-O3"/""/' configure*
 for file in AUTHORS ChangeLog ; do
@@ -70,6 +74,8 @@
 install -Dpm 644 src/info/matroska.xpm \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/mkvinfo.xpm
 
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -85,7 +91,7 @@
 %posttrans gui
 gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
 
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,0755)
 %doc AUTHORS COPYING README ChangeLog TODO
 %attr(755,root,root) %{_bindir}/base64tool
@@ -112,6 +118,11 @@
 %{_datadir}/icons/hicolor/32x32/apps/mmg.xpm
 
 %changelog
+* Sun Mar 01 2009 Dominik Mierzejewski <rpm at greysector.net> 2.5.2-1
+- updated to 2.5.2
+- fix compilation
+- include translated messages
+
 * Fri Feb 27 2009 Dominik Mierzejewski <rpm at greysector.net> 2.5.1-1
 - updated to 2.5.1
 - dropped obsolete patches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	27 Feb 2009 02:09:12 -0000	1.10
+++ sources	1 Mar 2009 09:36:35 -0000	1.11
@@ -1 +1 @@
-22f6572eb34b6e7cfda9e621f0936b10  mkvtoolnix-2.5.1.tar.bz2
+85ae3a5e447f0cdc41d9bc3b5c9b1358  mkvtoolnix-2.5.2.tar.bz2


