From 6013f455549f5089ee8bc96a7dd0fc0f375e4e25 2017-01-02 00:55:24 From: Richard H Date: 2017-01-02 00:55:24 Subject: [PATCH] update deadbeef to 0.6.2 --- diff --git a/media-sound/deadbeef/Manifest b/media-sound/deadbeef/Manifest new file mode 100644 index 0000000000000000000000000000000000000000..10e0ee725b3e3e73b293fedfb84c7539fda8c302 --- /dev/null +++ b/media-sound/deadbeef/Manifest @@ -0,0 +1,3 @@ +AUX deadbeef-libzip-1.patch 2717 SHA256 a8f68f394b98e6b2723b64bddf92783a86bba1f360998609de2c7a79b5800565 SHA512 bff088226884fedd7c5d53a5772a240f61da2987c0ceb9ef4df80633211e1a764663497e99e6dcb68f937391449f341a733b4497ff24c1b1bf70200c269ad6de WHIRLPOOL eedae266674eee9c8941b75f54fd77990d393969e7104f52483857fd35e226e3cdee29ea7a0f3bbaec1d1b22138c280d72d7325b3959d6ad0b860b1161d002ac +DIST deadbeef-0.6.2.tar.bz2 3495920 SHA256 3433b966683286c03ffbcc79b2201cd517f8dbf6b41da8600778dfa93cd64e1a SHA512 7caee245d7fa68e98ce5edc6aa6acc829d62c963f523c81e0406182a1aa36759219a8c0a2bdf010ac810f22b15acc81d06e8cab4ab820956c96cbc0a94423b7b WHIRLPOOL a8fc10c0f44f9f4d4eafb99a52f26efef34c2a1164d19b1f60693347a4b7a5564c6f7fafd394914149240a2a2f30926ce853bf42bbf3a07699bd8ba422a59f63 +EBUILD deadbeef-0.6.2.ebuild 4587 SHA256 6b39583cc8c5084ba7b9ef8a2a9450cf4bf0177089ed8d5b5073677b647953e4 SHA512 a89ce0ab5d0765de6ebc4c720e95d0b4acfd21767fa248290d50f9770ecc3a9e3060417a316e4bf75261f62a6b2f6bcbb92f2e7da1799903c1826f0f7d546696 WHIRLPOOL e5884114fc4462d4a1ae4cd198a2ca640fdf1a88208438506cc25d65dd0719066dd97e13496c12cb8793943bcb6d235bc723576c9106fbbce5beed8b27b30f16 diff --git a/media-sound/deadbeef/deadbeef-0.6.2.ebuild b/media-sound/deadbeef/deadbeef-0.6.2.ebuild new file mode 100644 index 0000000000000000000000000000000000000000..87c39ceb89a322e25a72d70e5cf6bd1167530aee --- /dev/null +++ b/media-sound/deadbeef/deadbeef-0.6.2.ebuild @@ -0,0 +1,187 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="5" + +inherit fdo-mime gnome2-utils versionator + +MY_PV="$(replace_version_separator 3 '-')" + +SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.bz2 + http://sourceforge.net/projects/${PN}/files/${PN}-${MY_PV}.tar.bz2/download -> ${PN}-${MY_PV}.tar.bz2" +KEYWORDS="~x86 ~amd64" + +DESCRIPTION="foobar2000-like music player" +HOMEPAGE="http://deadbeef.sourceforge.net/" + +LICENSE="GPL-2 + LGPL-2.1 + ZLIB + psf? ( BSD XMAME ) + dumb? ( DUMB-0.9.2 ) + shn? ( shorten )" +SLOT="0" +IUSE="adplug aac alsa psf ape cdda cover cover-imlib2 dts dumb converter curl ffmpeg flac gme + hotkeys infobar lastfm m3u midi mms mp3 musepack nls notify nullout oss pulseaudio rpath mono2stereo + shellexec shn sid sndfile src static supereq threads tta vorbis vtx wavpack zip gtk3 +gtk2" + +LANGS="be bg bn ca cs da de el en_GB es fa fi fr gl he hr hu id it ja kk km lg nb nl pl pt_BR pt ru si sk sl sr@latin sr sv te tr uk vi zh_CN zh_TW" +for lang in ${LANGS}; do + IUSE+=" linguas_${lang}" +done + +RDEPEND="aac? ( media-libs/faad2 ) + alsa? ( media-libs/alsa-lib ) + cdda? ( dev-libs/libcdio media-libs/libcddb ) + cover? ( media-libs/imlib2 ) + ffmpeg? ( virtual/ffmpeg ) + flac? ( media-libs/flac ) + gtk2? ( x11-libs/gtk+:2 + x11-libs/libICE + x11-libs/libSM ) + gtk3? ( x11-libs/gtk+:3 + x11-libs/libICE + x11-libs/libSM ) + lastfm? ( net-misc/curl ) + notify? ( sys-apps/dbus ) + midi? ( media-sound/timidity-freepats ) + mms? ( media-libs/libmms ) + mp3? ( media-libs/libmad ) + musepack? ( media-sound/musepack-tools ) + pulseaudio? ( media-sound/pulseaudio ) + sndfile? ( media-libs/libsndfile ) + src? ( media-libs/libsamplerate ) + vorbis? ( media-libs/libvorbis ) + wavpack? ( media-sound/wavpack ) + zip? ( dev-libs/libzip + sys-libs/zlib )" + +DEPEND=" + ape? ( dev-lang/yasm ) + dev-util/intltool + ${RDEPEND}" +S="${WORKDIR}/${PN}-${MY_PV}" +pkg_setup() { + # fixme, is it fine? + if { use psf || use dumb || use shn; } && use static ; then + die "ao/converter/dumb or shn plugins can't be built statically" + fi +} + +src_prepare() { + epatch "${FILESDIR}/${PN}-libzip-1.patch" + if use midi ; then + # set default gentoo path + sed -e 's;/etc/timidity++/timidity-freepats.cfg;/usr/share/timidity/freepats/timidity.cfg;g' \ + -i "${S}/plugins/wildmidi/wildmidiplug.c" + fi + for lang in ${LANGS};do + for x in ${lang};do + if ! use linguas_${x}; then + rm -f "po/${x}.po" + fi + done + done +} + +src_configure() { + my_config="--disable-portable + --docdir=/usr/share/${PN} + $(use_enable aac) + $(use_enable adplug) + $(use_enable alsa) + $(use_enable ape ffap) + $(use_enable cdda) + $(use_enable converter) + $(use_enable dts dca) + $(use_enable dumb) + $(use_enable ffmpeg) + $(use_enable flac) + $(use_enable gme) + $(use_enable hotkeys) + $(use_enable m3u) + $(use_enable midi wildmidi) + $(use_enable mms) + $(use_enable mono2stereo) + $(use_enable mp3 mad) + $(use_enable musepack) + $(use_enable nls) + $(use_enable notify) + $(use_enable nullout) + $(use_enable oss) + $(use_enable psf) + $(use_enable pulseaudio pulse) + $(use_enable rpath) + $(use_enable shellexec) + $(use_enable shn) + $(use_enable sid) + $(use_enable sndfile) + $(use_enable src) + $(use_enable static) + $(use_enable static staticlink) + $(use_enable supereq) + $(use_enable threads) + $(use_enable tta) + $(use_enable vorbis) + $(use_enable vtx) + $(use_enable wavpack) + $(use_enable zip vfs-zip)" + + if use cover || use lastfm ; then + my_config="${my_config} + --enable-vfs-curl + $(use_enable cover artwork) + $(use_enable cover-imlib2 artwork-imlib2) + $(use_enable lastfm lfm)" + else + my_config="${my_config} + $(use_enable cover artwork) + $(use_enable cover-imlib2 artwork-imlib2) + $(use_enable curl vfs-curl) + $(use_enable lastfm lfm)" + fi + + if use infobar; then + my_config="${my_config} + --enable-vfs-curl" + fi + + if use gtk3;then + my_config="${my_config} + --enable-gtk3 + --enable-gtkui" + fi + + if use gtk2;then + my_config="${my_config} + --enable-gtkui" + else + my_config="${my_config} + --disable-gtk2" + fi + econf ${my_config} +} + +pkg_preinst() { + gnome2_icon_savelist + gnome2_schemas_savelist +} + +pkg_postinst() { + if use midi ; then + einfo "enable manually freepats support for timidity via" + einfo "eselect timidity set --global freepats" + fi + fdo-mime_desktop_database_update + fdo-mime_mime_database_update + gnome2_icon_cache_update + gnome2_schemas_update +} + +pkg_postrm() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update + gnome2_icon_cache_update + gnome2_schemas_update +} diff --git a/media-sound/deadbeef/files/deadbeef-libzip-1.patch b/media-sound/deadbeef/files/deadbeef-libzip-1.patch new file mode 100644 index 0000000000000000000000000000000000000000..1078a061fb422dd214fa7f8cdf2638f2ba00c6a2 --- /dev/null +++ b/media-sound/deadbeef/files/deadbeef-libzip-1.patch @@ -0,0 +1,88 @@ +From 7dcd89d1a02cfbdd06f759a8517b469e85bf8375 Mon Sep 17 00:00:00 2001 +From: proudzhu +Date: Tue, 19 May 2015 21:26:08 +0800 +Subject: [PATCH] rename zip_file_t to ddb_zip_file_t in vfs_zip.c to fix build + with libzip > 1.0.0 + +lizip 1.0.0 introduces a new struct named zip_file_t, thus the origin +code cannot build against it. +--- + plugins/vfs_zip/vfs_zip.c | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/plugins/vfs_zip/vfs_zip.c b/plugins/vfs_zip/vfs_zip.c +index 752e7f5..f146867 100644 +--- a/plugins/vfs_zip/vfs_zip.c ++++ b/plugins/vfs_zip/vfs_zip.c +@@ -54,7 +54,7 @@ typedef struct { + int buffer_remaining; + int buffer_pos; + #endif +-} zip_file_t; ++} ddb_zip_file_t; + + static const char *scheme_names[] = { "zip://", NULL }; + +@@ -108,8 +108,8 @@ vfs_zip_open (const char *fname) { + return NULL; + } + +- zip_file_t *f = malloc (sizeof (zip_file_t)); +- memset (f, 0, sizeof (zip_file_t)); ++ ddb_zip_file_t *f = malloc (sizeof (ddb_zip_file_t)); ++ memset (f, 0, sizeof (ddb_zip_file_t)); + f->file.vfs = &plugin; + f->z = z; + f->zf = zf; +@@ -122,7 +122,7 @@ vfs_zip_open (const char *fname) { + void + vfs_zip_close (DB_FILE *f) { + trace ("vfs_zip: close\n"); +- zip_file_t *zf = (zip_file_t *)f; ++ ddb_zip_file_t *zf = (ddb_zip_file_t *)f; + if (zf->zf) { + zip_fclose (zf->zf); + } +@@ -134,7 +134,7 @@ vfs_zip_close (DB_FILE *f) { + + size_t + vfs_zip_read (void *ptr, size_t size, size_t nmemb, DB_FILE *f) { +- zip_file_t *zf = (zip_file_t *)f; ++ ddb_zip_file_t *zf = (ddb_zip_file_t *)f; + // printf ("read: %d\n", size*nmemb); + + size_t sz = size * nmemb; +@@ -167,7 +167,7 @@ vfs_zip_read (void *ptr, size_t size, size_t nmemb, DB_FILE *f) { + + int + vfs_zip_seek (DB_FILE *f, int64_t offset, int whence) { +- zip_file_t *zf = (zip_file_t *)f; ++ ddb_zip_file_t *zf = (ddb_zip_file_t *)f; + // printf ("seek: %lld (%d)\n", offset, whence); + + if (whence == SEEK_CUR) { +@@ -242,13 +242,13 @@ vfs_zip_seek (DB_FILE *f, int64_t offset, int whence) { + + int64_t + vfs_zip_tell (DB_FILE *f) { +- zip_file_t *zf = (zip_file_t *)f; ++ ddb_zip_file_t *zf = (ddb_zip_file_t *)f; + return zf->offset; + } + + void + vfs_zip_rewind (DB_FILE *f) { +- zip_file_t *zf = (zip_file_t *)f; ++ ddb_zip_file_t *zf = (ddb_zip_file_t *)f; + zip_fclose (zf->zf); + zf->zf = zip_fopen_index (zf->z, zf->index, 0); + assert (zf->zf); // FIXME: better error handling? +@@ -260,7 +260,7 @@ vfs_zip_rewind (DB_FILE *f) { + + int64_t + vfs_zip_getlength (DB_FILE *f) { +- zip_file_t *zf = (zip_file_t *)f; ++ ddb_zip_file_t *zf = (ddb_zip_file_t *)f; + return zf->size; + } +