From 8d5dbd847cbc704a6a06405856e94b461011afe3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 27 Mar 2021 06:06:27 +0000 Subject: gentoo resync : 27.03.2021 --- media-sound/moc/Manifest | 4 +- .../files/moc-2.6_alpha3-stdint_uint_types.patch | 39 +++++++++ media-sound/moc/moc-2.6_alpha3-r2.ebuild | 94 ---------------------- media-sound/moc/moc-2.6_alpha3-r3.ebuild | 15 +++- 4 files changed, 54 insertions(+), 98 deletions(-) create mode 100644 media-sound/moc/files/moc-2.6_alpha3-stdint_uint_types.patch delete mode 100644 media-sound/moc/moc-2.6_alpha3-r2.ebuild (limited to 'media-sound/moc') diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest index 166b0759083d..0ccc0495f10e 100644 --- a/media-sound/moc/Manifest +++ b/media-sound/moc/Manifest @@ -1,7 +1,7 @@ AUX ffmpeg4.patch 1401 BLAKE2B 116679802c4acb9e843dbb8d656177ae133aefc49a270392eededdae662d7ead518fa4301e1c7d231acfd4a7fd3053d807611737add6a1746ec119e400a1f199 SHA512 c29db5f40e7a206fcdb05958c0dc3a479f3e9d0ebd02703c26049162b8cc7d88875f508f29eee387270c96cb381ea93366498faa79d62bf21686e24a1142f608 +AUX moc-2.6_alpha3-stdint_uint_types.patch 1179 BLAKE2B 73dcba135553cd9630cf44e42a4651785d6b9d1cacb554be166a7772c56fbfdc1b4165c6951c810e962a6b4dc24fe714eb739244490b9a975e79b1d67e82dec6 SHA512 642be986fb147aa81251ce9c3f86761ff9f24c61e84fd447e243da34b1e9058a94f27ef632144f01e3c989bc321346bdc543130fd090520fb3064668a8017110 DIST moc-2.5.2.tar.bz2 602728 BLAKE2B 10b568404632f29ed5fd1d04ec424aa364a6e74c1a31d47cb9a3b377ccd04e2be53e57274e76daed29177368c944740fd26cc862fc498f950070f0b83b0acc7a SHA512 992d06809fb52e58dcee63704bde05795b99edbac46edd8381f314c564490013b18e1853926f419c2c3c7f1bb68ff35e97048de03ace3232b800cf4b3b7dbe0f DIST moc-2.6-alpha3.tar.xz 496676 BLAKE2B 3b4f31676c869a0cacd44cce1e4509304e3b00a15e578eb394510fbe0ddaf53f5c5628f2dccd60f4b3925f3e597d9fbc04bc2a8e090e2e05227b822f1aa05ef0 SHA512 e38e277e5e945827308f47a8f3614eb1e52c16271da372f50e7b6427a7dfc994e1c66761a9e46326bf483b91e9127efe7796a329c62e95524609edfb3a7603bf EBUILD moc-2.5.2-r1.ebuild 2109 BLAKE2B a24ab48ca76fe6a1d062bd2d7e875daad0b833e73687a6c328d21c89f4857fc270f0fb57f79e6554253b6d2ce2ce8ada2d8970f3a325840a5681f89276be9dd4 SHA512 d7b1a37f2a5b162c8637af93a5da4a39e7080904054eb7d6cc3433521a43447b2d670137af09b74d19fa98b8cd647f83045a21bdad5692f81adb898523d0a667 -EBUILD moc-2.6_alpha3-r2.ebuild 2248 BLAKE2B e74e11a9a71a95399bb7e4c802d14b3992a63a8a1c9a5386fe857fa2cc48b61c1851d41aae5c438cf7c65d8a54e2213c243953849220a61607b304580db50eba SHA512 bf4131162002fc37857ea0022f7304ef7d6f7bda45cd8ed96a1fd3d204ddbe0b1f4b3cb6a544a9661fe915d6144c07586812e9cc8926747c85148b97505b48b9 -EBUILD moc-2.6_alpha3-r3.ebuild 2309 BLAKE2B d64957278960b177987a702701a5519b30439da37c2b254f97b0fcbaa402159a5eb669d9bab35d4d2aa71dc636eba405905a4a40e9202e2a1e0d19058aa4dd43 SHA512 3299e36a66c407ea53df6d4e6a8cce0ee1493b4e07e585b9c6e0bdcdbfe49e4c2dd953b6d81e6faf0489346cb0a808e1ada04a3eeb07fcc325d8367da3812a74 +EBUILD moc-2.6_alpha3-r3.ebuild 2438 BLAKE2B 50bbaaff6f02794b7eb77a56caebc58dd13c19fec125e29a4011b030e03325c4452ed156f1d5d2368665f30af5d81e89f51f9c5a94e273c5d7b76c7b62878633 SHA512 5feca35ca9a9a21ff77558b3dd46d29a0e451e789ce696554eebfa2e9fcbde56d61d72954c6262276762c25702dc1e697467ca47b996c664cc3b8bce004229c3 MISC metadata.xml 620 BLAKE2B f4b43ba546218153ab2e3c980ca4b09e4b82a35dc17755be3904beb7131f22f71b756edc913f0dce4285e779a1b4a75c474577c81095d341c50d45b03f407497 SHA512 fd676e1ee0aba80032597c106ae94a451e9e2762fffe0b7a33119d2701eea37ac400d25849bd668654bcf7ed8d12af91c0bcab4e6006d5cd3bf0f35af098baa2 diff --git a/media-sound/moc/files/moc-2.6_alpha3-stdint_uint_types.patch b/media-sound/moc/files/moc-2.6_alpha3-stdint_uint_types.patch new file mode 100644 index 000000000000..1600af599b28 --- /dev/null +++ b/media-sound/moc/files/moc-2.6_alpha3-stdint_uint_types.patch @@ -0,0 +1,39 @@ +diff -ru a/configure.in b/configure.in +--- a/configure.in 2016-11-16 02:29:53.000000000 +0200 ++++ b/configure.in 2020-11-21 06:07:06.778092416 +0200 +@@ -152,9 +152,9 @@ + CFLAGS="$save_CFLAGS" + LDFLAGS="$LDFLAGS $BDB_LDFLAGS" + EXTRA_LIBS="$EXTRA_LIBS $BDB_LIBS" +- AC_CHECK_TYPES([u_int], , , [[#include "${srcdir}/compiler.h"] ++ AC_CHECK_TYPES([u_int,u_int32_t], , , [[#include "${srcdir}/compiler.h"] + [#include ] +- [#include ]]) ++ [#include ]]) + fi + + AC_ARG_WITH(oss, AS_HELP_STRING([--without-oss], +diff -ru a/tags_cache.c b/tags_cache.c +--- a/tags_cache.c 2016-11-16 02:29:53.000000000 +0200 ++++ b/tags_cache.c 2020-11-21 06:02:55.043214842 +0200 +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_DB_H + # ifndef HAVE_U_INT +@@ -32,6 +33,12 @@ + typedef unsigned int u_int; + typedef unsigned long int u_long; + # endif ++# ifndef HAVE_U_INT32_T ++typedef uint8_t u_int8_t; ++typedef uint16_t u_int16_t; ++typedef uint32_t u_int32_t; ++typedef uint64_t u_int64_t; ++# endif + #include + #endif + diff --git a/media-sound/moc/moc-2.6_alpha3-r2.ebuild b/media-sound/moc/moc-2.6_alpha3-r2.ebuild deleted file mode 100644 index 649ff0ddc2ed..000000000000 --- a/media-sound/moc/moc-2.6_alpha3-r2.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_P=${PN}-${PV/_/-} -DESCRIPTION="Music On Console - ncurses interface for playing audio files" -HOMEPAGE="https://moc.daper.net" -SRC_URI="http://ftp.daper.net/pub/soft/moc/unstable/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86" -IUSE="aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modplug musepack - oss sid sndfile speex timidity tremor +unicode vorbis wavpack" - -RDEPEND=" - >=dev-libs/libltdl-2:0 - dev-libs/popt - sys-libs/ncurses:0=[unicode?] - aac? ( media-libs/faad2 ) - alsa? ( >=media-libs/alsa-lib-1.0.11 ) - cache? ( >=sys-libs/db-4.1:= ) - curl? ( >=net-misc/curl-7.15.1 ) - ffmpeg? ( >=media-video/ffmpeg-1.2.6-r1 ) - flac? ( >=media-libs/flac-1.1.3 ) - jack? ( virtual/jack ) - libsamplerate? ( >=media-libs/libsamplerate-0.1.0 ) - mad? ( - media-libs/libmad - sys-libs/zlib - media-libs/libid3tag - ) - magic? ( sys-apps/file ) - modplug? ( >=media-libs/libmodplug-0.7 ) - musepack? ( - media-sound/musepack-tools - >=media-libs/taglib-1.5 - ) - sid? ( >=media-libs/libsidplay-2.1.1 ) - sndfile? ( >=media-libs/libsndfile-1.0.0 ) - speex? ( >=media-libs/speex-1.0.0 ) - timidity? ( - >=media-libs/libtimidity-0.1.0 - media-sound/timidity++ - ) - vorbis? ( - >=media-libs/libogg-1.0 - tremor? ( media-libs/tremor ) - !tremor? ( >=media-libs/libvorbis-1.0 ) - ) - wavpack? ( >=media-sound/wavpack-4.31 ) -" -DEPEND="${RDEPEND} - app-arch/xz-utils - virtual/pkgconfig -" - -S=${WORKDIR}/${MY_P} -PATCHES=( "${FILESDIR}/ffmpeg4.patch" ) - -src_configure() { - local myconf=( - --without-rcc - $(use_enable debug) - $(use_enable cache) - $(use_with oss) - $(use_with alsa) - $(use_with jack) - $(use_with magic) - $(use_with unicode ncursesw) - $(use_with libsamplerate samplerate) - $(use_with aac) - $(use_with ffmpeg) - $(use_with flac) - $(use_with modplug) - $(use_with mad mp3) - $(use_with musepack) - $(use_with sid sidplay2) - $(use_with sndfile) - $(use_with speex) - $(use_with timidity) - $(use_with vorbis vorbis $(usex tremor tremor "")) - $(use_with wavpack) - $(use_with curl) - ) - - econf "${myconf[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/media-sound/moc/moc-2.6_alpha3-r3.ebuild b/media-sound/moc/moc-2.6_alpha3-r3.ebuild index 76ce43971282..7bad54ab70ab 100644 --- a/media-sound/moc/moc-2.6_alpha3-r3.ebuild +++ b/media-sound/moc/moc-2.6_alpha3-r3.ebuild @@ -3,6 +3,8 @@ EAPI=7 +inherit autotools + MY_P=${PN}-${PV/_/-} DESCRIPTION="Music On Console - ncurses interface for playing audio files" HOMEPAGE="https://moc.daper.net" @@ -10,7 +12,7 @@ SRC_URI="http://ftp.daper.net/pub/soft/moc/unstable/${MY_P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86" IUSE="aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modplug musepack oss sid sndfile sndio speex timidity tremor +unicode vorbis wavpack" @@ -58,7 +60,16 @@ DEPEND="${RDEPEND} " S=${WORKDIR}/${MY_P} -PATCHES=( "${FILESDIR}/ffmpeg4.patch" ) +PATCHES=( + "${FILESDIR}/ffmpeg4.patch" + "${FILESDIR}/${P}-stdint_uint_types.patch" +) + +src_prepare() { + default + mv configure.{in,ac} || die + eautoreconf +} src_configure() { local myconf=( -- cgit v1.2.3