Hello community, here is the log from the commit of package kio_audiocd for openSUSE:Factory checked in at 2013-10-03 15:57:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kio_audiocd (Old) and /work/SRC/openSUSE:Factory/.kio_audiocd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kio_audiocd" Changes: -------- --- /work/SRC/openSUSE:Factory/kio_audiocd/kio_audiocd.changes 2013-09-09 11:08:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kio_audiocd.new/kio_audiocd.changes 2013-10-03 15:58:53.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Sep 28 15:14:49 UTC 2013 - tittiatc...@gmail.com + +- Update to 4.11.2 + * KDE 4.11.2 bugfix release + * See http://www.kde.org/announcements/announce-4.11.2.php + +------------------------------------------------------------------- Old: ---- audiocd-kio-4.11.1.tar.xz New: ---- audiocd-kio-4.11.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kio_audiocd.spec ++++++ --- /var/tmp/diff_new_pack.UMxDTN/_old 2013-10-03 15:58:54.000000000 +0200 +++ /var/tmp/diff_new_pack.UMxDTN/_new 2013-10-03 15:58:54.000000000 +0200 @@ -28,7 +28,7 @@ License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org -Version: 4.11.1 +Version: 4.11.2 Release: 0 Source0: audiocd-kio-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ audiocd-kio-4.11.1.tar.xz -> audiocd-kio-4.11.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/audiocd-kio-4.11.1/plugins/CMakeLists.txt new/audiocd-kio-4.11.2/plugins/CMakeLists.txt --- old/audiocd-kio-4.11.1/plugins/CMakeLists.txt 2013-06-28 19:40:16.000000000 +0200 +++ new/audiocd-kio-4.11.2/plugins/CMakeLists.txt 2013-09-26 21:25:24.000000000 +0200 @@ -9,9 +9,9 @@ macro_optional_find_package(OggVorbis) macro_log_feature(OGGVORBIS_FOUND "OggVorbis" "Libraries for Ogg Vorbis general audio compression codec" "http://www.xiph.org"; FALSE "" "Required for the AudioCD Ogg Vorbis plugin.") -if (OGGVORBIS_FOUND) +if (OGGVORBIS_FOUND AND HAVE_LIBVORBISENC2) add_subdirectory( vorbis ) -endif(OGGVORBIS_FOUND) +endif(OGGVORBIS_FOUND AND HAVE_LIBVORBISENC2) add_subdirectory( wav ) add_subdirectory( lame ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/audiocd-kio-4.11.1/plugins/vorbis/CMakeLists.txt new/audiocd-kio-4.11.2/plugins/vorbis/CMakeLists.txt --- old/audiocd-kio-4.11.1/plugins/vorbis/CMakeLists.txt 2013-06-28 19:40:16.000000000 +0200 +++ new/audiocd-kio-4.11.2/plugins/vorbis/CMakeLists.txt 2013-09-26 21:25:24.000000000 +0200 @@ -4,8 +4,6 @@ ########### next target ############### -add_definitions(-DHAVE_VORBIS) - set(audiocd_encoder_vorbis_PART_SRCS encodervorbis.cpp ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/audiocd-kio-4.11.1/plugins/vorbis/encodervorbis.cpp new/audiocd-kio-4.11.2/plugins/vorbis/encodervorbis.cpp --- old/audiocd-kio-4.11.1/plugins/vorbis/encodervorbis.cpp 2013-06-28 19:40:16.000000000 +0200 +++ new/audiocd-kio-4.11.2/plugins/vorbis/encodervorbis.cpp 2013-09-26 21:25:24.000000000 +0200 @@ -25,8 +25,6 @@ #include "encodervorbis.h" #include "audiocd_vorbis_encoder.h" -#ifdef HAVE_VORBIS - #include <vorbis/vorbisenc.h> #include <time.h> #include <stdlib.h> @@ -139,11 +137,8 @@ // Now that we have read in the settings apply them to the encoder lib switch (d->vorbis_encode_method) { case 0: -/* Support very old libvorbis by simply falling through. */ -#if HAVE_VORBIS >= 2 vorbis_encode_init_vbr(&d->vi, 2, 44100, d->vorbis_quality/10.0); break; -#endif case 1: vorbis_encode_init(&d->vi, 2, 44100, d->vorbis_bitrate_upper, d->vorbis_bitrate_nominal, d->vorbis_bitrate_lower); break; @@ -155,18 +150,11 @@ long processed(0); while(vorbis_analysis_blockout(&d->vd,&d->vb)==1) { - /* Support ancient libvorbis (< RC3). */ -#if HAVE_VORBIS >= 2 vorbis_analysis(&d->vb,NULL); /* Non-ancient case. */ vorbis_bitrate_addblock(&d->vb); while(vorbis_bitrate_flushpacket(&d->vd, &d->op)) { -#else - vorbis_analysis(&d->vb,&d->op); - /* Make a lexical block to place the #ifdef's nearby. */ - if (1) { -#endif ogg_stream_packetin(&d->os,&d->op); while(int result=ogg_stream_pageout(&d->os,&d->og)) { if (!result) break; @@ -193,9 +181,6 @@ switch (d->vorbis_encode_method) { case 0: // quality based encoding - -#if HAVE_VORBIS >= 2 // If really old Vorbis is being used, skip this nicely. - { // Estimated numbers based on the Vorbis FAQ: // http://www.xiph.org/archives/vorbis-faq/200203/0030.html @@ -209,9 +194,6 @@ break; } - -#endif // HAVE_VORBIS >= 2 - default: // bitrate based encoding vorbis_size = (time_secs * d->vorbis_bitrate/8); break; @@ -321,5 +303,3 @@ } } -#endif // HAVE_VORBIS - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/audiocd-kio-4.11.1/plugins/vorbis/encodervorbis.h new/audiocd-kio-4.11.2/plugins/vorbis/encodervorbis.h --- old/audiocd-kio-4.11.1/plugins/vorbis/encodervorbis.h 2013-06-28 19:40:16.000000000 +0200 +++ new/audiocd-kio-4.11.2/plugins/vorbis/encodervorbis.h 2013-09-26 21:25:24.000000000 +0200 @@ -26,7 +26,6 @@ #define ENCODER_VORBIS_H #include "ui_encodervorbisconfig.h" -#ifdef HAVE_VORBIS #include <audiocdencoder.h> @@ -41,7 +40,6 @@ /** * Ogg Vorbis encoder. - * This encoder is only enabled when HAVE_VORBIS is set. * Check out http://www.vorbis.com/ for lots of information. */ class EncoderVorbis : public AudioCDEncoder { @@ -70,7 +68,5 @@ }; -#endif // HAVE_VORBIS - #endif // ENCODER_VORBIS_H -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
