commit: c2374d1613f689dcea637a805f383da4cfe511b6
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 22:24:25 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 22:38:00 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2374d16
media-libs/libsidplay: Fix patches.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-libs/libsidplay/files/libsidplay-2.1.1-fbsd.patch | 4 ++--
...sidplay2-gcc41.patch => libsidplay-2.1.1-gcc41.patch} | 8 ++++----
media-libs/libsidplay/files/libsidplay-2.1.1-gcc43.patch | 16 ++++++++--------
.../files/libsidplay-2.1.1-no_libtool_reference.patch | 8 ++++----
media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild | 4 ++--
5 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/media-libs/libsidplay/files/libsidplay-2.1.1-fbsd.patch
b/media-libs/libsidplay/files/libsidplay-2.1.1-fbsd.patch
index b2f4acd..0f4740e 100644
--- a/media-libs/libsidplay/files/libsidplay-2.1.1-fbsd.patch
+++ b/media-libs/libsidplay/files/libsidplay-2.1.1-fbsd.patch
@@ -1,5 +1,5 @@
---- libsidutils/src/ini/ini.cpp
-+++ libsidutils/src/ini/ini.cpp
+--- a/libsidutils/src/ini/ini.cpp
++++ b/libsidutils/src/ini/ini.cpp
@@ -100,7 +100,7 @@
//*******************************************************************************************************************
#include <assert.h>
diff --git a/media-libs/libsidplay/files/libsidplay2-gcc41.patch
b/media-libs/libsidplay/files/libsidplay-2.1.1-gcc41.patch
similarity index 82%
rename from media-libs/libsidplay/files/libsidplay2-gcc41.patch
rename to media-libs/libsidplay/files/libsidplay-2.1.1-gcc41.patch
index f2e3b31..c05f8d3 100644
--- a/media-libs/libsidplay/files/libsidplay2-gcc41.patch
+++ b/media-libs/libsidplay/files/libsidplay-2.1.1-gcc41.patch
@@ -1,5 +1,5 @@
---- libsidplay/include/sidplay/SmartPtr.h
-+++ libsidplay/include/sidplay/SmartPtr.h
+--- a/libsidplay/include/sidplay/SmartPtr.h
++++ b/libsidplay/include/sidplay/SmartPtr.h
@@ -211,16 +211,16 @@
{
if ( bufferLen >= 1 )
@@ -24,8 +24,8 @@
}
}
};
---- libsidutils/include/sidplay/utils/SidUsage.h
-+++ libsidutils/include/sidplay/utils/SidUsage.h
+--- a/libsidutils/include/sidplay/utils/SidUsage.h
++++ b/libsidutils/include/sidplay/utils/SidUsage.h
@@ -33,7 +33,7 @@
uint_least16_t length; // usage scan length
diff --git a/media-libs/libsidplay/files/libsidplay-2.1.1-gcc43.patch
b/media-libs/libsidplay/files/libsidplay-2.1.1-gcc43.patch
index 857a297..419b126 100644
--- a/media-libs/libsidplay/files/libsidplay-2.1.1-gcc43.patch
+++ b/media-libs/libsidplay/files/libsidplay-2.1.1-gcc43.patch
@@ -1,5 +1,5 @@
---- builders/resid-builder/src/resid.cpp
-+++ builders/resid-builder/src/resid.cpp
+--- a/builders/resid-builder/src/resid.cpp
++++ b/builders/resid-builder/src/resid.cpp
@@ -16,6 +16,8 @@
* *
***************************************************************************/
@@ -9,8 +9,8 @@
#include "config.h"
#ifdef HAVE_EXCEPTIONS
---- builders/resid-builder/src/resid-builder.cpp
-+++ builders/resid-builder/src/resid-builder.cpp
+--- a/builders/resid-builder/src/resid-builder.cpp
++++ b/builders/resid-builder/src/resid-builder.cpp
@@ -37,6 +37,7 @@
***************************************************************************/
@@ -19,8 +19,8 @@
#include "config.h"
#ifdef HAVE_EXCEPTIONS
---- builders/hardsid-builder/src/hardsid-builder.cpp
-+++ builders/hardsid-builder/src/hardsid-builder.cpp
+--- a/builders/hardsid-builder/src/hardsid-builder.cpp
++++ b/builders/hardsid-builder/src/hardsid-builder.cpp
@@ -47,6 +47,7 @@
***************************************************************************/
@@ -29,8 +29,8 @@
#include "config.h"
#ifdef HAVE_EXCEPTIONS
---- libsidplay/src/sidtune/SidTune.cpp
-+++ libsidplay/src/sidtune/SidTune.cpp
+--- a/libsidplay/src/sidtune/SidTune.cpp
++++ b/libsidplay/src/sidtune/SidTune.cpp
@@ -283,7 +283,7 @@
uint_least32_t fileLen = 0;
diff --git
a/media-libs/libsidplay/files/libsidplay-2.1.1-no_libtool_reference.patch
b/media-libs/libsidplay/files/libsidplay-2.1.1-no_libtool_reference.patch
index ee05643..c93f3cf 100644
--- a/media-libs/libsidplay/files/libsidplay-2.1.1-no_libtool_reference.patch
+++ b/media-libs/libsidplay/files/libsidplay-2.1.1-no_libtool_reference.patch
@@ -1,5 +1,5 @@
---- libsidplay/unix/libsidplay2.pc.in
-+++ libsidplay/unix/libsidplay2.pc.in
+--- a/libsidplay/unix/libsidplay2.pc.in
++++ b/libsidplay/unix/libsidplay2.pc.in
@@ -7,5 +7,5 @@
Name: @PACKAGE@
Description: C64 cycle exact stereo sidplayer library.
@@ -7,8 +7,8 @@
-Libs: ${libdir}/libsidplay2.la
+Libs: -lsidplay2
Cflags: -DHAVE_UNIX -I${includedir}
---- libsidutils/unix/libsidutils.pc.in
-+++ libsidutils/unix/libsidutils.pc.in
+--- a/libsidutils/unix/libsidutils.pc.in
++++ b/libsidutils/unix/libsidutils.pc.in
@@ -6,5 +6,5 @@
Name: @PACKAGE@
Description: Utils for supporting the libsidplay2 library.
diff --git a/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild
b/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild
index 99e72b3..9dbf823 100644
--- a/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild
+++ b/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -26,7 +26,7 @@ MULTILIB_WRAPPED_HEADERS=(
src_prepare() {
epatch \
- "${FILESDIR}"/${PN}2-gcc41.patch \
+ "${FILESDIR}"/${P}-gcc41.patch \
"${FILESDIR}"/${P}-fbsd.patch \
"${FILESDIR}"/${P}-gcc43.patch \
"${FILESDIR}"/${P}-no_libtool_reference.patch
