commit: e873f15d87ec7ebdcc48ef6b54538d6a6c33484a Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Thu May 19 12:00:54 2016 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Thu May 19 12:01:04 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e873f15d
app-cdr/k3b: Fix build with gcc-6 Revision bump adds upstream patch to fix build with gcc-6. Gentoo-bug: 583034 Thanks-to: Peter Levine <plevine457 <AT> gmail.com> Package-Manager: portage-2.3.0_rc1 app-cdr/k3b/files/k3b-2.0.3-gcc6.patch | 98 ++++++++++++++++++++++++++ app-cdr/k3b/k3b-2.0.3-r3.ebuild | 121 +++++++++++++++++++++++++++++++++ 2 files changed, 219 insertions(+) diff --git a/app-cdr/k3b/files/k3b-2.0.3-gcc6.patch b/app-cdr/k3b/files/k3b-2.0.3-gcc6.patch new file mode 100644 index 0000000..d912d82 --- /dev/null +++ b/app-cdr/k3b/files/k3b-2.0.3-gcc6.patch @@ -0,0 +1,98 @@ +From da6373a3e1ae9199ee50e326fe296c03b50625ae Mon Sep 17 00:00:00 2001 +From: "P. Levine" <[email protected]> +Date: Sat, 14 May 2016 18:57:24 +0200 +Subject: [PATCH] Fix narrowing conversions from 'int' to 'const char' inside { + }. + +Please provide a proper git patch including author information next time ... + +BUGS: 363078 +FIXED-IN: 2.0.4 +--- + libk3b/projects/k3bcdrdaowriter.cpp | 2 +- + libk3b/tools/k3bwavefilewriter.cpp | 22 +++++++++++----------- + plugins/encoder/external/k3bexternalencoder.cpp | 22 +++++++++++----------- + 3 files changed, 23 insertions(+), 23 deletions(-) + +diff --git a/libk3b/projects/k3bcdrdaowriter.cpp b/libk3b/projects/k3bcdrdaowriter.cpp +index 4eebdf8..bca1407 100644 +--- a/libk3b/projects/k3bcdrdaowriter.cpp ++++ b/libk3b/projects/k3bcdrdaowriter.cpp +@@ -908,7 +908,7 @@ void K3b::CdrdaoWriter::parseCdrdaoWrote( const QString& line ) + + void K3b::CdrdaoWriter::parseCdrdaoMessage() + { +- static const char msgSync[] = { 0xff, 0x00, 0xff, 0x00 }; ++ static const char msgSync[] = { (char)0xff, (char)0x00, (char)0xff, (char)0x00 }; + unsigned int avail = m_comSock->bytesAvailable(); + unsigned int msgs = avail / ( sizeof(msgSync)+d->progressMsgSize ); + unsigned int count = 0; +diff --git a/libk3b/tools/k3bwavefilewriter.cpp b/libk3b/tools/k3bwavefilewriter.cpp +index c51781f..6772f6c 100644 +--- a/libk3b/tools/k3bwavefilewriter.cpp ++++ b/libk3b/tools/k3bwavefilewriter.cpp +@@ -111,17 +111,17 @@ void K3b::WaveFileWriter::writeEmptyHeader() + { + static const char riffHeader[] = + { +- 0x52, 0x49, 0x46, 0x46, // 0 "RIFF" +- 0x00, 0x00, 0x00, 0x00, // 4 wavSize +- 0x57, 0x41, 0x56, 0x45, // 8 "WAVE" +- 0x66, 0x6d, 0x74, 0x20, // 12 "fmt " +- 0x10, 0x00, 0x00, 0x00, // 16 +- 0x01, 0x00, 0x02, 0x00, // 20 +- 0x44, 0xac, 0x00, 0x00, // 24 +- 0x10, 0xb1, 0x02, 0x00, // 28 +- 0x04, 0x00, 0x10, 0x00, // 32 +- 0x64, 0x61, 0x74, 0x61, // 36 "data" +- 0x00, 0x00, 0x00, 0x00 // 40 byteCount ++ (char)0x52, (char)0x49, (char)0x46, (char)0x46, // 0 "RIFF" ++ (char)0x00, (char)0x00, (char)0x00, (char)0x00, // 4 wavSize ++ (char)0x57, (char)0x41, (char)0x56, (char)0x45, // 8 "WAVE" ++ (char)0x66, (char)0x6d, (char)0x74, (char)0x20, // 12 "fmt " ++ (char)0x10, (char)0x00, (char)0x00, (char)0x00, // 16 ++ (char)0x01, (char)0x00, (char)0x02, (char)0x00, // 20 ++ (char)0x44, (char)0xac, (char)0x00, (char)0x00, // 24 ++ (char)0x10, (char)0xb1, (char)0x02, (char)0x00, // 28 ++ (char)0x04, (char)0x00, (char)0x10, (char)0x00, // 32 ++ (char)0x64, (char)0x61, (char)0x74, (char)0x61, // 36 "data" ++ (char)0x00, (char)0x00, (char)0x00, (char)0x00 // 40 byteCount + }; + + m_outputStream.writeRawData( riffHeader, 44 ); +diff --git a/plugins/encoder/external/k3bexternalencoder.cpp b/plugins/encoder/external/k3bexternalencoder.cpp +index 388d181..d365905 100644 +--- a/plugins/encoder/external/k3bexternalencoder.cpp ++++ b/plugins/encoder/external/k3bexternalencoder.cpp +@@ -39,17 +39,17 @@ Q_DECLARE_METATYPE( QProcess::ExitStatus ) + + static const char s_riffHeader[] = + { +- 0x52, 0x49, 0x46, 0x46, // 0 "RIFF" +- 0x00, 0x00, 0x00, 0x00, // 4 wavSize +- 0x57, 0x41, 0x56, 0x45, // 8 "WAVE" +- 0x66, 0x6d, 0x74, 0x20, // 12 "fmt " +- 0x10, 0x00, 0x00, 0x00, // 16 +- 0x01, 0x00, 0x02, 0x00, // 20 +- 0x44, 0xac, 0x00, 0x00, // 24 +- 0x10, 0xb1, 0x02, 0x00, // 28 +- 0x04, 0x00, 0x10, 0x00, // 32 +- 0x64, 0x61, 0x74, 0x61, // 36 "data" +- 0x00, 0x00, 0x00, 0x00 // 40 byteCount ++ (char)0x52, (char)0x49, (char)0x46, (char)0x46, // 0 "RIFF" ++ (char)0x00, (char)0x00, (char)0x00, (char)0x00, // 4 wavSize ++ (char)0x57, (char)0x41, (char)0x56, (char)0x45, // 8 "WAVE" ++ (char)0x66, (char)0x6d, (char)0x74, (char)0x20, // 12 "fmt " ++ (char)0x10, (char)0x00, (char)0x00, (char)0x00, // 16 ++ (char)0x01, (char)0x00, (char)0x02, (char)0x00, // 20 ++ (char)0x44, (char)0xac, (char)0x00, (char)0x00, // 24 ++ (char)0x10, (char)0xb1, (char)0x02, (char)0x00, // 28 ++ (char)0x04, (char)0x00, (char)0x10, (char)0x00, // 32 ++ (char)0x64, (char)0x61, (char)0x74, (char)0x61, // 36 "data" ++ (char)0x00, (char)0x00, (char)0x00, (char)0x00 // 40 byteCount + }; + + +-- +2.8.2 + diff --git a/app-cdr/k3b/k3b-2.0.3-r3.ebuild b/app-cdr/k3b/k3b-2.0.3-r3.ebuild new file mode 100644 index 0000000..a4f43f9 --- /dev/null +++ b/app-cdr/k3b/k3b-2.0.3-r3.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +MULTIMEDIA_REQUIRED="always" +WEBKIT_REQUIRED="always" +KDE_HANDBOOK="optional" + +# Translations are not available, since this is a snapshot +KDE_LINGUAS="ast be bg bs ca ca@valencia cs csb da de el en_GB eo es et eu fi fr +ga gl he hi hne hr hu is it ja kk km ko ku lt lv mai mr ms nb nds nl nn oc pa pl +pt pt_BR ro ru se sk sl sr sr@ijekavian sr@ijekavianlatin sr@latin sv th tr ug uk +zh_CN zh_TW" + +SRC_URI="mirror://kde/stable/${PN}/${P}a.tar.xz" +DOCS=( FAQ PERMISSIONS README ) + +inherit kde4-base + +DESCRIPTION="The CD/DVD Kreator for KDE" +HOMEPAGE="http://www.k3b.org/"; + +LICENSE="GPL-2 FDL-1.2" +SLOT="4" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis" + +CDEPEND=" + $(add_kdeapps_dep libkcddb) + media-libs/libsamplerate + dvd? ( media-libs/libdvdread ) + ffmpeg? ( + libav? ( media-video/libav:= ) + !libav? ( media-video/ffmpeg:0= ) + ) + flac? ( >=media-libs/flac-1.2[cxx] ) + mp3? ( media-sound/lame ) + mad? ( media-libs/libmad ) + musepack? ( >=media-sound/musepack-tools-444 ) + sndfile? ( media-libs/libsndfile ) + taglib? ( >=media-libs/taglib-1.5 ) + vorbis? ( media-libs/libvorbis ) +" +DEPEND="${CDEPEND} + sys-devel/gettext +" +RDEPEND="${CDEPEND} + $(add_kdebase_dep kdelibs 'udev,udisks(+)') + app-cdr/cdrdao + media-sound/cdparanoia + virtual/cdrtools + dvd? ( + >=app-cdr/dvd+rw-tools-7 + encode? ( media-video/transcode[dvd] ) + ) + emovix? ( media-video/emovix ) + sox? ( media-sound/sox ) + vcd? ( media-video/vcdimager ) +" + +DOCS+=( ChangeLog ) + +PATCHES=( + "${FILESDIR}/${P}-libav-11.patch" + "${FILESDIR}/${P}-gcc6.patch" +) + +REQUIRED_USE=" + mp3? ( encode ) + sox? ( encode ) +" + +src_prepare() { + kde4-base_src_prepare + + # bug 558640 + sed -i -e "/^add_subdirectory( doc )/d" CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + -DK3B_BUILD_API_DOCS=OFF + -DK3B_BUILD_K3BSETUP=OFF + -DK3B_BUILD_WAVE_DECODER_PLUGIN=ON + -DK3B_ENABLE_HAL_SUPPORT=OFF + -DK3B_ENABLE_MUSICBRAINZ=OFF + -DK3B_DEBUG=$(usex debug) + -DK3B_ENABLE_DVD_RIPPING=$(usex dvd) + -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=$(usex encode) + -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg) + -DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac) + -DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex mp3) + -DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad) + -DK3B_BUILD_MUSE_DECODER_PLUGIN=$(usex musepack) + -DK3B_BUILD_SNDFILE_DECODER_PLUGIN=$(usex sndfile) + -DK3B_BUILD_SOX_ENCODER_PLUGIN=$(usex sox) + -DK3B_ENABLE_TAGLIB=$(usex taglib) + -DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis) + -DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis) + ) + + kde4-base_src_configure +} + +pkg_postinst() { + kde4-base_pkg_postinst + + echo + elog "We don't install k3bsetup anymore because Gentoo doesn't need it." + elog "If you get warnings on start-up, uncheck the \"Check system" + elog "configuration\" option in the \"Misc\" settings window." + echo + + local group=cdrom + use kernel_linux || group=operator + elog "Make sure you have proper read/write permissions on the cdrom device(s)." + elog "Usually, it is sufficient to be in the ${group} group." + echo +}
