Hello community, here is the log from the commit of package libebml for openSUSE:Factory checked in at Mon Sep 26 10:34:56 CEST 2011.
-------- --- libebml/libebml.changes 2011-06-30 12:21:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/libebml/libebml.changes 2011-09-26 01:42:29.000000000 +0200 @@ -1,0 +2,8 @@ +Sun Sep 25 23:35:22 UTC 2011 - reddw...@opensuse.org + +- Update to version 1.2.2 + + fix usage of the DEBUG #define (use LIBEBML_DEBUG instead) + + The EbmlCodeVersion variable now resides in the library instead of being declared static in the header file. + + only use the test element to read once in the loop + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libebml-1.2.1.tar.bz2 New: ---- libebml-1.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libebml.spec ++++++ --- /var/tmp/diff_new_pack.uRzlXC/_old 2011-09-26 10:34:52.000000000 +0200 +++ /var/tmp/diff_new_pack.uRzlXC/_new 2011-09-26 10:34:52.000000000 +0200 @@ -19,23 +19,20 @@ %define soname 3 Name: libebml -Version: 1.2.1 -Release: 1 +Version: 1.2.2 +Release: 0 License: LGPLv2.1+ Summary: Libary to Parse EBML Files Url: http://www.matroska.org/ Group: Development/Libraries/Other -Source: http://dl.matroska.org/downloads/libebml/%{name}-%{version}.tar.bz2 +Source: http://dl.matroska.org/downloads/libebml/libebml-%{version}.tar.bz2 BuildRequires: gcc-c++ -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description libebml is a C++ library to parse EBML files. See the EBML RFV at http://www.matroska.org/technical/specs/rfc/. %package -n libebml%{soname} - - License: LGPLv2.1+ Summary: Libary to Parse EBML Files Group: Development/Libraries/Other @@ -44,7 +41,7 @@ libebml is a C++ library to parse EBML files. See the EBML RFV at http://www.matroska.org/technical/specs/rfc/. -%package -n libebml-devel +%package devel License: LGPLv2.1+ Summary: Libary to Parse EBML Files Group: Development/Libraries/Other @@ -52,7 +49,7 @@ Requires: glibc-devel Requires: libstdc++-devel -%description -n libebml-devel +%description devel libebml is a C++ library to parse EBML files. See the EBML RFV at http://www.matroska.org/technical/specs/rfc/. @@ -67,9 +64,6 @@ cd make/linux %{__make} libdir=%{buildroot}%{_libdir} includedir=%{buildroot}%{_includedir}/ebml install_sharedlib install_headers -%clean -%{__rm} -rf %{buildroot} - %post -n libebml%{soname} -p /sbin/ldconfig %postun -n libebml%{soname} -p /sbin/ldconfig @@ -78,7 +72,7 @@ %defattr (0644,root,root,0755) %{_libdir}/libebml.so.%{soname} -%files -n libebml-devel +%files devel %defattr (0644,root,root,0755) %{_libdir}/libebml.so %{_includedir}/ebml ++++++ libebml-1.2.1.tar.bz2 -> libebml-1.2.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libebml-1.2.1/ChangeLog new/libebml-1.2.2/ChangeLog --- old/libebml-1.2.1/ChangeLog 2011-06-26 19:39:25.000000000 +0200 +++ new/libebml-1.2.2/ChangeLog 2011-09-23 13:26:59.000000000 +0200 @@ -1,3 +1,9 @@ +2011-09-23 robux4/mosu +New 1.2.2 version: + - fix usage of the DEBUG #define (use LIBEBML_DEBUG instead) + - The EbmlCodeVersion variable now resides in the library instead of being declared static in the header file. + - only use the test element to read once in the loop + 2011-06-26 robux4/mosu New 1.2.1 version: - fix the constructor of CRTError in StdIOCallback (patch from Graham 'gbooker' Booker) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libebml-1.2.1/debian/changelog new/libebml-1.2.2/debian/changelog --- old/libebml-1.2.1/debian/changelog 2011-06-15 13:58:26.000000000 +0200 +++ new/libebml-1.2.2/debian/changelog 2011-09-23 13:26:59.000000000 +0200 @@ -1,3 +1,9 @@ +libebml (1.2.2-1) natty; urgency=low + + * New version. + + -- Moritz Bunkus <mor...@bunkus.org> Fri, 23 Sep 2011 13:22:24 +0200 + libebml (1.2.1-1) natty; urgency=low * New version. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libebml-1.2.1/ebml/Debug.h new/libebml-1.2.2/ebml/Debug.h --- old/libebml-1.2.1/ebml/Debug.h 2010-08-15 15:07:48.000000000 +0200 +++ new/libebml-1.2.2/ebml/Debug.h 2011-09-09 06:00:42.000000000 +0200 @@ -52,7 +52,7 @@ static const int MAX_PREFIX_LENGTH = 128; -#if defined(DEBUG) +#if defined(LIBEBML_DEBUG) // define the working debugging class class EBML_DLL_API ADbg @@ -102,7 +102,7 @@ #endif // WIN32 }; -#else // defined(DEBUG) +#else // defined(LIBEBML_DEBUG) // define a class that does nothing (no output) @@ -145,7 +145,7 @@ } }; -#endif // defined(DEBUG) +#endif // defined(LIBEBML_DEBUG) extern class EBML_DLL_API ADbg globalDebug; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libebml-1.2.1/ebml/EbmlConfig.h new/libebml-1.2.2/ebml/EbmlConfig.h --- old/libebml-1.2.1/ebml/EbmlConfig.h 2010-03-23 14:35:44.000000000 +0100 +++ new/libebml-1.2.2/ebml/EbmlConfig.h 2011-09-09 06:00:42.000000000 +0200 @@ -96,7 +96,7 @@ // The LIBEBML_DEBUG symbol is defined, when we are creating a debug build. In this // case the debug logging code is compiled in. -#if (defined(DEBUG)||defined(_DEBUG))&&!defined(LIBEBML_DEBUG) +#if (defined(DEBUG)||defined(_DEBUG)) && !defined(LIBEBML_DEBUG) #define LIBEBML_DEBUG #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libebml-1.2.1/ebml/EbmlVersion.h new/libebml-1.2.2/ebml/EbmlVersion.h --- old/libebml-1.2.1/ebml/EbmlVersion.h 2011-06-12 11:21:05.000000000 +0200 +++ new/libebml-1.2.2/ebml/EbmlVersion.h 2011-09-11 11:03:43.000000000 +0200 @@ -30,7 +30,7 @@ /*! \file - \version \$Id: EbmlVersion.h 756 2011-06-12 09:21:05Z robux4 $ + \version \$Id: EbmlVersion.h 803 2011-09-11 09:03:43Z mosub $ \author Steve Lhomme <robux4 @ users.sf.net> */ #ifndef LIBEBML_VERSION_H @@ -42,10 +42,10 @@ START_LIBEBML_NAMESPACE -#define LIBEBML_VERSION 0x010201 +#define LIBEBML_VERSION 0x010202 -static const std::string EbmlCodeVersion = "1.2.1"; -static const std::string EbmlCodeDate = __TIMESTAMP__; +extern const std::string EbmlCodeVersion; +extern const std::string EbmlCodeDate; /*! \todo Closer relation between an element and the context it comes from (context is an element attribute ?) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libebml-1.2.1/libebml.proj new/libebml-1.2.2/libebml.proj --- old/libebml-1.2.1/libebml.proj 2011-03-27 18:43:10.000000000 +0200 +++ new/libebml-1.2.2/libebml.proj 2011-09-09 06:00:42.000000000 +0200 @@ -2,7 +2,7 @@ LIB ebml { - PROJECT_VERSION 1.2.1 + PROJECT_VERSION 1.2.2 INCLUDE . EXPINCLUDE . @@ -14,7 +14,7 @@ REDUCE_SIZE . FASTER_FLOAT . -// SOURCE src/Debug.cpp + SOURCE src/Debug.cpp SOURCE src/EbmlBinary.cpp SOURCE src/EbmlContexts.cpp SOURCE src/EbmlCrc32.cpp @@ -38,7 +38,7 @@ SOURCE(TARGET_WIN) src/platform/win32/WinIOCallback.cpp HEADER(TARGET_WIN) src/platform/win32/WinIOCallback.h -// HEADER ebml/Debug.h + HEADER ebml/Debug.h HEADER ebml/EbmlBinary.h HEADER ebml/EbmlConfig.h HEADER ebml/EbmlContexts.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libebml-1.2.1/make/linux/fedora-core.spec new/libebml-1.2.2/make/linux/fedora-core.spec --- old/libebml-1.2.1/make/linux/fedora-core.spec 2011-06-26 20:13:26.000000000 +0200 +++ new/libebml-1.2.2/make/linux/fedora-core.spec 2011-09-23 13:26:59.000000000 +0200 @@ -1,7 +1,7 @@ # SPEC file for libebml on (at least) Fedora Core 1, 2, 3 Name: libebml -Version: 1.2.1 +Version: 1.2.2 Release: 1 License: LGPL Summary: Extensible Binary Meta Language diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libebml-1.2.1/make/linux/suse.spec new/libebml-1.2.2/make/linux/suse.spec --- old/libebml-1.2.1/make/linux/suse.spec 2011-06-26 20:13:26.000000000 +0200 +++ new/libebml-1.2.2/make/linux/suse.spec 2011-09-23 13:26:59.000000000 +0200 @@ -14,7 +14,7 @@ Name: libebml URL: http://sourceforge.net/projects/ebml -Version: 1.2.1 +Version: 1.2.2 Release: 1 Summary: libary to parse EBML files. License: LGPL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libebml-1.2.1/src/Debug.cpp new/libebml-1.2.2/src/Debug.cpp --- old/libebml-1.2.1/src/Debug.cpp 2010-08-15 15:07:48.000000000 +0200 +++ new/libebml-1.2.2/src/Debug.cpp 2011-09-09 06:00:42.000000000 +0200 @@ -49,7 +49,7 @@ class ADbg globalDebug; -#if defined(DEBUG) +#if defined(LIBEBML_DEBUG) ////////////////////////////////////////////////////////////////////// // Construction/Destruction @@ -232,6 +232,6 @@ return result; } -#endif // defined(DEBUG) +#endif // defined(LIBEBML_DEBUG) END_LIBEBML_NAMESPACE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libebml-1.2.1/src/EbmlElement.cpp new/libebml-1.2.2/src/EbmlElement.cpp --- old/libebml-1.2.1/src/EbmlElement.cpp 2011-03-20 18:33:49.000000000 +0100 +++ new/libebml-1.2.2/src/EbmlElement.cpp 2011-09-09 06:00:42.000000000 +0200 @@ -28,7 +28,7 @@ /*! \file - \version \$Id: EbmlElement.cpp 708 2011-03-20 17:33:49Z robux4 $ + \version \$Id: EbmlElement.cpp 796 2011-09-09 04:00:42Z robux4 $ \author Steve Lhomme <robux4 @ users.sf.net> */ @@ -486,6 +486,7 @@ Result = DataStream.FindNextElement(Context, bUpperElement, 0xFFFFFFFFL, AllowDummyElt); } else { Result = TestReadElt; + TestReadElt = NULL; } if (Result != NULL) { @@ -581,14 +582,14 @@ if (!bWithDefault && IsDefaultValue()) { return 0; } -#if defined(_DEBUG) || defined(DEBUG) +#if defined(LIBEBML_DEBUG) uint64 SupposedSize = UpdateSize(bWithDefault, bForceRender); -#endif // _DEBUG +#endif // LIBEBML_DEBUG filepos_t result = RenderHead(output, bForceRender, bWithDefault, bKeepPosition); uint64 WrittenSize = RenderData(output, bForceRender, bWithDefault); -#if defined(_DEBUG) || defined(DEBUG) +#if defined(LIBEBML_DEBUG) if (static_cast<int64>(SupposedSize) != (0-1)) assert(WrittenSize == SupposedSize); -#endif // DEBUG +#endif // LIBEBML_DEBUG result += WrittenSize; return result; } catch (std::exception & ex) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libebml-1.2.1/src/EbmlMaster.cpp new/libebml-1.2.2/src/EbmlMaster.cpp --- old/libebml-1.2.1/src/EbmlMaster.cpp 2011-03-20 18:33:49.000000000 +0100 +++ new/libebml-1.2.2/src/EbmlMaster.cpp 2011-09-09 06:00:42.000000000 +0200 @@ -30,7 +30,7 @@ /*! \file - \version \$Id: EbmlMaster.cpp 708 2011-03-20 17:33:49Z robux4 $ + \version \$Id: EbmlMaster.cpp 796 2011-09-09 04:00:42Z robux4 $ \author Steve Lhomme <robux4 @ users.sf.net> */ @@ -145,10 +145,10 @@ continue; (ElementList[Index])->UpdateSize(bWithDefault, bForceRender); uint64 SizeToAdd = (ElementList[Index])->ElementSize(bWithDefault); -#if defined(_DEBUG) || defined(DEBUG) +#if defined(LIBEBML_DEBUG) if (static_cast<int64>(SizeToAdd) == (0-1)) return (0-1); -#endif // DEBUG +#endif // LIBEBML_DEBUG SetSize_(GetSize() + SizeToAdd); } if (bChecksumUsed) { @@ -204,10 +204,10 @@ for (EltIdx = 0; EltIdx < EBML_CTX_SIZE(Context); EltIdx++) { if (EBML_CTX_IDX(Context,EltIdx).IsMandatory()) { if (FindElt(EBML_CTX_IDX_INFO(Context,EltIdx)) == NULL) { -#if defined(_DEBUG) || defined(DEBUG) +#if defined(LIBEBML_DEBUG) // you are missing this Mandatory element // const char * MissingName = EBML_INFO_NAME(EBML_CTX_IDX_INFO(Context,EltIdx)); -#endif // DEBUG +#endif // LIBEBML_DEBUG return false; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libebml-1.2.1/src/EbmlVersion.cpp new/libebml-1.2.2/src/EbmlVersion.cpp --- old/libebml-1.2.1/src/EbmlVersion.cpp 2010-03-15 17:19:18.000000000 +0100 +++ new/libebml-1.2.2/src/EbmlVersion.cpp 2011-09-11 11:03:43.000000000 +0200 @@ -11,12 +11,12 @@ ** 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 library 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, write to the Free Software ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -38,4 +38,7 @@ START_LIBEBML_NAMESPACE +const std::string EbmlCodeVersion = "1.2.2"; +const std::string EbmlCodeDate = __TIMESTAMP__; + END_LIBEBML_NAMESPACE ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
