diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-libs/libsidplay | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-libs/libsidplay')
-rw-r--r-- | media-libs/libsidplay/Manifest | 2 | ||||
-rw-r--r-- | media-libs/libsidplay/files/65resid | 1 | ||||
-rw-r--r-- | media-libs/libsidplay/files/libsidplay-1.36.59-gcc43.patch | 38 | ||||
-rw-r--r-- | media-libs/libsidplay/files/libsidplay-2.1.1-fbsd.patch | 11 | ||||
-rw-r--r-- | media-libs/libsidplay/files/libsidplay-2.1.1-gcc43.patch | 69 | ||||
-rw-r--r-- | media-libs/libsidplay/files/libsidplay-2.1.1-no_libtool_reference.patch | 18 | ||||
-rw-r--r-- | media-libs/libsidplay/files/libsidplay-gcc34.patch | 26 | ||||
-rw-r--r-- | media-libs/libsidplay/files/libsidplay2-gcc41.patch | 37 | ||||
-rw-r--r-- | media-libs/libsidplay/libsidplay-1.36.59-r1.ebuild | 34 | ||||
-rw-r--r-- | media-libs/libsidplay/libsidplay-1.36.59.ebuild | 31 | ||||
-rw-r--r-- | media-libs/libsidplay/libsidplay-2.1.1-r2.ebuild | 53 | ||||
-rw-r--r-- | media-libs/libsidplay/libsidplay-2.1.1-r3.ebuild | 53 | ||||
-rw-r--r-- | media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild | 58 | ||||
-rw-r--r-- | media-libs/libsidplay/metadata.xml | 10 |
14 files changed, 441 insertions, 0 deletions
diff --git a/media-libs/libsidplay/Manifest b/media-libs/libsidplay/Manifest new file mode 100644 index 000000000000..7bb1714673f3 --- /dev/null +++ b/media-libs/libsidplay/Manifest @@ -0,0 +1,2 @@ +DIST libsidplay-1.36.59.tgz 390097 SHA256 3da9b38d4eb5bf9e936b9604ba92da0594ef38047d50cf806a8e11c400008024 SHA512 e7b0859e1389683d3e6aad7040b78ba37bb0a393c85f68ddb8a064371f978b34cc2e951ec564fa1117d12885cd976d10b02937e132d9a11badecd8652cf4d410 WHIRLPOOL 121e985c861454c8755c4c6fe8066936bc0149c89ca9197ee23d03657f4e87b48e8f1e2c9e26202b04a1291746782be62cff86f16384ce9a9a50f885af9f4279 +DIST sidplay-libs-2.1.1.tar.gz 1900252 SHA256 e9a24ada48215a46d2c232a70c5601bc9505e997f120e8f2ba3713e09e28d1f9 SHA512 754cd41f3d2d76754049522c395022bc090f99ea838e6d1ffb8d7689f3aedad9b3879be0312d0af49ba108563296c1176d1e533d1151d5b33368bfda0a1910e3 WHIRLPOOL 53b4bd66bbac0bfc29514981f34e19fac41bae356d06e727f3a0f2ad2bedcb1cd815d22656bcf06460e9d908a91433bbdea029805af43b1cd97310f230f1c89c diff --git a/media-libs/libsidplay/files/65resid b/media-libs/libsidplay/files/65resid new file mode 100644 index 000000000000..d534fb9286ec --- /dev/null +++ b/media-libs/libsidplay/files/65resid @@ -0,0 +1 @@ +LDPATH="/usr/lib64/sidplay/builders:/usr/lib/sidplay/builders" diff --git a/media-libs/libsidplay/files/libsidplay-1.36.59-gcc43.patch b/media-libs/libsidplay/files/libsidplay-1.36.59-gcc43.patch new file mode 100644 index 000000000000..cc6810193b98 --- /dev/null +++ b/media-libs/libsidplay/files/libsidplay-1.36.59-gcc43.patch @@ -0,0 +1,38 @@ +--- src/sidtune.cpp ++++ src/sidtune.cpp +@@ -306,11 +306,7 @@ udword sidTune::loadFile(const char* fileName, ubyte** bufferRef) + return 0; + } + // Open binary input file stream at end of file. +-#if defined(SID_HAVE_IOS_BIN) +- ifstream myIn( fileName, ios::in|ios::bin|ios::ate ); +-#else + ifstream myIn( fileName, ios::in|ios::binary|ios::ate ); +-#endif + // As a replacement for !is_open(), bad() and the NOT-operator + // don't seem to work on all systems. + #if defined(SID_DONT_HAVE_IS_OPEN) +@@ -972,11 +968,7 @@ bool sidTune::saveC64dataFile( const char* fileName, bool overWriteFlag ) + } + // Open binary output file stream. + else +-#if defined(SID_HAVE_IOS_BIN) +- fMyOut.open( fileName, ios::out|ios::bin|ios::trunc ); +-#else + fMyOut.open( fileName, ios::out|ios::binary|ios::trunc ); +-#endif + if ( !fMyOut ) + { + info.statusString = text_cantCreateFile; +@@ -1061,11 +1053,7 @@ bool sidTune::savePSIDfile( const char* fileName, bool overWriteFlag ) + } + // Open binary output file stream. + else +-#if defined(SID_HAVE_IOS_BIN) +- fMyOut.open( fileName, ios::out|ios::bin|ios::trunc ); +-#else + fMyOut.open( fileName, ios::out|ios::binary|ios::trunc ); +-#endif + if ( !fMyOut ) + { + info.statusString = text_cantCreateFile; diff --git a/media-libs/libsidplay/files/libsidplay-2.1.1-fbsd.patch b/media-libs/libsidplay/files/libsidplay-2.1.1-fbsd.patch new file mode 100644 index 000000000000..b2f4acd41a7c --- /dev/null +++ b/media-libs/libsidplay/files/libsidplay-2.1.1-fbsd.patch @@ -0,0 +1,11 @@ +--- libsidutils/src/ini/ini.cpp ++++ libsidutils/src/ini/ini.cpp +@@ -100,7 +100,7 @@ + //******************************************************************************************************************* + #include <assert.h> + #include <ctype.h> +-#include <malloc.h> ++#include <stdlib.h> + #include <stdio.h> + #include <string.h> + diff --git a/media-libs/libsidplay/files/libsidplay-2.1.1-gcc43.patch b/media-libs/libsidplay/files/libsidplay-2.1.1-gcc43.patch new file mode 100644 index 000000000000..857a29750d11 --- /dev/null +++ b/media-libs/libsidplay/files/libsidplay-2.1.1-gcc43.patch @@ -0,0 +1,69 @@ +--- builders/resid-builder/src/resid.cpp ++++ builders/resid-builder/src/resid.cpp +@@ -16,6 +16,8 @@ + * * + ***************************************************************************/ + ++#include <cstring> ++ + #include "config.h" + + #ifdef HAVE_EXCEPTIONS +--- builders/resid-builder/src/resid-builder.cpp ++++ builders/resid-builder/src/resid-builder.cpp +@@ -37,6 +37,7 @@ + ***************************************************************************/ + + #include <stdio.h> ++#include <cstring> + + #include "config.h" + #ifdef HAVE_EXCEPTIONS +--- builders/hardsid-builder/src/hardsid-builder.cpp ++++ builders/hardsid-builder/src/hardsid-builder.cpp +@@ -47,6 +47,7 @@ + ***************************************************************************/ + + #include <stdio.h> ++#include <cstring> + #include "config.h" + + #ifdef HAVE_EXCEPTIONS +--- libsidplay/src/sidtune/SidTune.cpp ++++ libsidplay/src/sidtune/SidTune.cpp +@@ -283,7 +283,7 @@ + uint_least32_t fileLen = 0; + + // This sucks big time +- openmode createAtrr = std::ios::in; ++ std::_Ios_Openmode createAtrr = std::ios::in; + #ifdef HAVE_IOS_NOCREATE + createAtrr |= std::ios::nocreate; + #endif +@@ -952,7 +952,7 @@ + if ( status ) + { + // Open binary output file stream. +- openmode createAttr = std::ios::out; ++ std::_Ios_Openmode createAttr = std::ios::out; + #if defined(HAVE_IOS_BIN) + createAttr |= std::ios::bin; + #else +@@ -1002,7 +1002,7 @@ + if ( status ) + { + // Open ASCII output file stream. +- openmode createAttr = std::ios::out; ++ std::_Ios_Openmode createAttr = std::ios::out; + if ( overWriteFlag ) + createAttr |= std::ios::trunc; + else +@@ -1036,7 +1036,7 @@ + if ( status ) + { + // Open binary output file stream. +- openmode createAttr = std::ios::out; ++ std::_Ios_Openmode createAttr = std::ios::out; + #if defined(HAVE_IOS_BIN) + createAttr |= std::ios::bin; + #else 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 new file mode 100644 index 000000000000..ee0564306a66 --- /dev/null +++ b/media-libs/libsidplay/files/libsidplay-2.1.1-no_libtool_reference.patch @@ -0,0 +1,18 @@ +--- libsidplay/unix/libsidplay2.pc.in ++++ libsidplay/unix/libsidplay2.pc.in +@@ -7,5 +7,5 @@ + Name: @PACKAGE@ + Description: C64 cycle exact stereo sidplayer library. + Version: @VERSION@ +-Libs: ${libdir}/libsidplay2.la ++Libs: -lsidplay2 + Cflags: -DHAVE_UNIX -I${includedir} +--- libsidutils/unix/libsidutils.pc.in ++++ libsidutils/unix/libsidutils.pc.in +@@ -6,5 +6,5 @@ + Name: @PACKAGE@ + Description: Utils for supporting the libsidplay2 library. + Version: @VERSION@ +-Libs: ${libdir}/libsidutils.la ++Libs: -lsidutils + Cflags: -DHAVE_UNIX -I${includedir} diff --git a/media-libs/libsidplay/files/libsidplay-gcc34.patch b/media-libs/libsidplay/files/libsidplay-gcc34.patch new file mode 100644 index 000000000000..bf59fc9c42b7 --- /dev/null +++ b/media-libs/libsidplay/files/libsidplay-gcc34.patch @@ -0,0 +1,26 @@ +--- src/smart.h ++++ src/smart.h +@@ -207,16 +207,16 @@ + { + if ( bufferLen >= 1 ) + { +- pBufCurrent = ( bufBegin = buffer ); +- bufEnd = bufBegin + bufferLen; +- bufLen = bufferLen; +- status = true; ++ this->pBufCurrent = ( this->bufBegin = buffer ); ++ this->bufEnd = this->bufBegin + bufferLen; ++ this->bufLen = bufferLen; ++ this->status = true; + } + else + { +- pBufCurrent = bufBegin = bufEnd = 0; +- bufLen = 0; +- status = false; ++ this->pBufCurrent = this->bufBegin = this->bufEnd = 0; ++ this->bufLen = 0; ++ this->status = false; + } + } + }; diff --git a/media-libs/libsidplay/files/libsidplay2-gcc41.patch b/media-libs/libsidplay/files/libsidplay2-gcc41.patch new file mode 100644 index 000000000000..f2e3b314d493 --- /dev/null +++ b/media-libs/libsidplay/files/libsidplay2-gcc41.patch @@ -0,0 +1,37 @@ +--- libsidplay/include/sidplay/SmartPtr.h ++++ libsidplay/include/sidplay/SmartPtr.h +@@ -211,16 +211,16 @@ + { + if ( bufferLen >= 1 ) + { +- pBufCurrent = ( bufBegin = buffer ); +- bufEnd = bufBegin + bufferLen; +- bufLen = bufferLen; +- status = true; ++ this->pBufCurrent = ( this->bufBegin = buffer ); ++ this->bufEnd = this->bufBegin + bufferLen; ++ this->bufLen = bufferLen; ++ this->status = true; + } + else + { +- pBufCurrent = bufBegin = bufEnd = 0; +- bufLen = 0; +- status = false; ++ this->pBufCurrent = this->bufBegin = this->bufEnd = 0; ++ this->bufLen = 0; ++ this->status = false; + } + } + }; +--- libsidutils/include/sidplay/utils/SidUsage.h ++++ libsidutils/include/sidplay/utils/SidUsage.h +@@ -33,7 +33,7 @@ + uint_least16_t length; // usage scan length + + // Copy common parts of basic usage to extended usage. +- sid2_usage_t &sid2_usage_t::operator= (const sid_usage_t &usage) ++ sid2_usage_t &operator= (const sid_usage_t &usage) + { + *((sid_usage_t *) this) = usage; + return *this; diff --git a/media-libs/libsidplay/libsidplay-1.36.59-r1.ebuild b/media-libs/libsidplay/libsidplay-1.36.59-r1.ebuild new file mode 100644 index 000000000000..8b062da32058 --- /dev/null +++ b/media-libs/libsidplay/libsidplay-1.36.59-r1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=4 +inherit eutils libtool multilib-minimal + +DESCRIPTION="C64 SID player library" +HOMEPAGE="http://critical.ch/distfiles/" +SRC_URI="http://critical.ch/distfiles/${P}.tgz" + +LICENSE="GPL-2" +SLOT="1" +KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" +IUSE="static-libs" +RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r6 + !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" + +DOCS=( AUTHORS DEVELOPER ) + +src_prepare() { + epatch "${FILESDIR}"/${P}-gcc43.patch + elibtoolize # required for fbsd .so versioning +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" \ + econf $(use_enable static-libs static) +} + +multilib_src_install_all() { + prune_libtool_files --all + einstalldocs +} diff --git a/media-libs/libsidplay/libsidplay-1.36.59.ebuild b/media-libs/libsidplay/libsidplay-1.36.59.ebuild new file mode 100644 index 000000000000..770695cb0563 --- /dev/null +++ b/media-libs/libsidplay/libsidplay-1.36.59.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=4 +inherit eutils libtool + +DESCRIPTION="C64 SID player library" +HOMEPAGE="http://critical.ch/distfiles/" +SRC_URI="http://critical.ch/distfiles/${P}.tgz" + +LICENSE="GPL-2" +SLOT="1" +KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" +IUSE="static-libs" + +DOCS="AUTHORS DEVELOPER" + +src_prepare() { + epatch "${FILESDIR}"/${P}-gcc43.patch + elibtoolize # required for fbsd .so versioning +} + +src_configure() { + econf $(use_enable static-libs static) +} + +src_install() { + default + rm -f "${ED}"/usr/lib*/${PN}.la +} diff --git a/media-libs/libsidplay/libsidplay-2.1.1-r2.ebuild b/media-libs/libsidplay/libsidplay-2.1.1-r2.ebuild new file mode 100644 index 000000000000..9f25f74ab914 --- /dev/null +++ b/media-libs/libsidplay/libsidplay-2.1.1-r2.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=4 +inherit eutils libtool + +MY_P=sidplay-libs-${PV} + +DESCRIPTION="C64 SID player library" +HOMEPAGE="http://sidplay2.sourceforge.net/" +SRC_URI="mirror://sourceforge/sidplay2/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="2" +KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" +IUSE="static-libs" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + epatch \ + "${FILESDIR}"/${PN}2-gcc41.patch \ + "${FILESDIR}"/${P}-fbsd.patch \ + "${FILESDIR}"/${P}-gcc43.patch + + elibtoolize +} + +src_configure() { + econf \ + --enable-shared \ + $(use_enable static-libs static) \ + --with-pic +} + +src_install() { + emake DESTDIR="${D}" install + + docinto libsidplay + dodoc libsidplay/{AUTHORS,ChangeLog,README,TODO} + + docinto libsidutils + dodoc libsidutils/{AUTHORS,ChangeLog,README,TODO} + + docinto resid + dodoc resid/{AUTHORS,ChangeLog,NEWS,README,THANKS,TODO} + + doenvd "${FILESDIR}"/65resid + + # Libs: -line of libsidutils.pc and libsidplay2.pc reference .la files! + # find "${ED}" -name '*.la' -exec rm -f {} + +} diff --git a/media-libs/libsidplay/libsidplay-2.1.1-r3.ebuild b/media-libs/libsidplay/libsidplay-2.1.1-r3.ebuild new file mode 100644 index 000000000000..e5258364594c --- /dev/null +++ b/media-libs/libsidplay/libsidplay-2.1.1-r3.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=4 +inherit eutils libtool + +MY_P=sidplay-libs-${PV} + +DESCRIPTION="C64 SID player library" +HOMEPAGE="http://sidplay2.sourceforge.net/" +SRC_URI="mirror://sourceforge/sidplay2/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="static-libs" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + epatch \ + "${FILESDIR}"/${PN}2-gcc41.patch \ + "${FILESDIR}"/${P}-fbsd.patch \ + "${FILESDIR}"/${P}-gcc43.patch \ + "${FILESDIR}"/${P}-no_libtool_reference.patch + + elibtoolize +} + +src_configure() { + econf \ + --enable-shared \ + $(use_enable static-libs static) \ + --with-pic +} + +src_install() { + emake DESTDIR="${D}" install + + docinto libsidplay + dodoc libsidplay/{AUTHORS,ChangeLog,README,TODO} + + docinto libsidutils + dodoc libsidutils/{AUTHORS,ChangeLog,README,TODO} + + docinto resid + dodoc resid/{AUTHORS,ChangeLog,NEWS,README,THANKS,TODO} + + doenvd "${FILESDIR}"/65resid + + find "${ED}" -name '*.la' -exec rm -f {} + +} diff --git a/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild b/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild new file mode 100644 index 000000000000..99e72b3517a9 --- /dev/null +++ b/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=4 +inherit eutils libtool multilib-minimal + +MY_P=sidplay-libs-${PV} + +DESCRIPTION="C64 SID player library" +HOMEPAGE="http://sidplay2.sourceforge.net/" +SRC_URI="mirror://sourceforge/sidplay2/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="2" +KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" +IUSE="static-libs" +RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r6 + !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" + +S=${WORKDIR}/${MY_P} + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/sidplay/sidconfig.h +) + +src_prepare() { + epatch \ + "${FILESDIR}"/${PN}2-gcc41.patch \ + "${FILESDIR}"/${P}-fbsd.patch \ + "${FILESDIR}"/${P}-gcc43.patch \ + "${FILESDIR}"/${P}-no_libtool_reference.patch + + elibtoolize + multilib_copy_sources +} + +multilib_src_configure() { + econf \ + --enable-shared \ + $(use_enable static-libs static) \ + --with-pic +} + +multilib_src_install_all() { + docinto libsidplay + dodoc libsidplay/{AUTHORS,ChangeLog,README,TODO} + + docinto libsidutils + dodoc libsidutils/{AUTHORS,ChangeLog,README,TODO} + + docinto resid + dodoc resid/{AUTHORS,ChangeLog,NEWS,README,THANKS,TODO} + + doenvd "${FILESDIR}"/65resid + + prune_libtool_files --all +} diff --git a/media-libs/libsidplay/metadata.xml b/media-libs/libsidplay/metadata.xml new file mode 100644 index 000000000000..d58dafc788eb --- /dev/null +++ b/media-libs/libsidplay/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer> + <email>hanno@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="sourceforge">sidplay2</remote-id> + </upstream> +</pkgmetadata> |