diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-06-29 11:38:31 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-06-29 11:38:31 +0100 |
| commit | 90c88731bd036e5698b281fbc0a5f3aa4c9983ac (patch) | |
| tree | 83fc5facb6b12be510a37bc3d241cc63e965b13a /media-sound/fmdrv | |
| parent | feb0daf81d888e9160f9f94502de09b66f2a63fd (diff) | |
gentoo resync : 29.06.2020
Diffstat (limited to 'media-sound/fmdrv')
| -rw-r--r-- | media-sound/fmdrv/Manifest | 3 | ||||
| -rw-r--r-- | media-sound/fmdrv/files/fmdrv-1.0.7-fix-makefile.patch | 42 | ||||
| -rw-r--r-- | media-sound/fmdrv/fmdrv-1.0.7.ebuild | 27 |
3 files changed, 57 insertions, 15 deletions
diff --git a/media-sound/fmdrv/Manifest b/media-sound/fmdrv/Manifest index 0f00564c66bd..6766a9f544c0 100644 --- a/media-sound/fmdrv/Manifest +++ b/media-sound/fmdrv/Manifest @@ -1,4 +1,5 @@ +AUX fmdrv-1.0.7-fix-makefile.patch 1010 BLAKE2B cf0dc20d3a0a5092c053e66bc1a6ff140f1c66a49787b3889b8eee348d9ac85ce7c8cc23eded5c16e108d32db3170dbbb80b03de2b03befc8250d78b83290003 SHA512 fd08e27717674e97330c465f450dbc3e92ef6bb4c1a8485f64b7047023dd5e4f8869624f8b6538fbaaab015e11dca289cfb059cee0e27bd9f56543fc1c8df04c AUX fmdrv-1.0.7-ioperm.patch 434 BLAKE2B 355fa4db5dc48ff732aecdf6d9b79de934f4ff05647723d74953f0e6ca9e457bcd9973b7b71541c0a196ba136b471f0e4927801998cb0386b0c8abd0ca264177 SHA512 c092de86d3d2ec1dd403304b918b96196d4ceeb1856a1e2c21c1af5a5b71ab3cfa2a9e461de007296a74206cebc25c0f9633425b921f58d645a024bbbc2755b4 DIST fmdrv-1.0.7.tar.bz2 61373 BLAKE2B d361bb974c48ebbcbfdcf3e65c03c67b5449579671eebe862b8df1220da5e738045a6ad61ea4603ff38bb801f8bdc5d7572a5eedec1765773b18f7c61ba9792d SHA512 d5533aee5c4c4e6a08dd2ede07c2f657edf93cf89bdb43d3453badd8dde68ec39a94820f91098192202490d59e2abda49af03737db39d2bfdd6b009a65824f1d -EBUILD fmdrv-1.0.7.ebuild 829 BLAKE2B bfa070a39c7fe709502c6cd36c5141164e3c3452a05268ef9d4c88734cbe69e2d0722eb92575f2c15bb2c191897e0f287fa89c2a9b74220ae6d77908527e4aed SHA512 c380087eeaf15945596d210976a43fd585b411c9751c53b4c0d9522d491c253a4485262d8fbcbbe7c78988ef10d9328fe2eaffce48c99373fd2891b72e836f9d +EBUILD fmdrv-1.0.7.ebuild 732 BLAKE2B cb28b4938cdcfa2f48511c7d871fdba422d20234a154d26f68d73a449d4f17a0d7348fda1c8eee585477b09944adfa09c850ae2e95287feaa1cd6901778e0570 SHA512 17a561470fc3581d848199526366ad9b9a4a9e22ba2ac82e015a2f1ef5abc343c853f1403e54737af86be45b6359e70f82b04a01032ce101992c26bafb01e8ca MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 diff --git a/media-sound/fmdrv/files/fmdrv-1.0.7-fix-makefile.patch b/media-sound/fmdrv/files/fmdrv-1.0.7-fix-makefile.patch new file mode 100644 index 000000000000..a222752716c7 --- /dev/null +++ b/media-sound/fmdrv/files/fmdrv-1.0.7-fix-makefile.patch @@ -0,0 +1,42 @@ +--- a/Makefile ++++ b/Makefile +@@ -59,7 +59,7 @@ + #ELF (works): + # $(CC) -Wl,-r -nostdlib -o $@ $^ + #a.out (works): +- ar -rc $@ $^ ++ $(AR) -rc $@ $^ + + install: installbin + chown root $(BINDIR)/fmdrv +--- a/Makefile.sets ++++ b/Makefile.sets +@@ -1,22 +1,18 @@ + INSTALL=install +-CC=gcc +-CXX=g++ + +-CPP=$(CC) +-LDFLAGS=-g + #LDLIBS=-lstdc++ + +-CWARNINGS=-Wall -W -pipe -g \ ++CWARNINGS=-Wall -W \ + -Wundef \ +- -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes \ +- -Wmissing-prototypes -Winline ++ -Wcast-qual -Wcast-align -Wwrite-strings \ ++ -Winline + # -Wtraditional -fmessage-length=128 + +-CXXFLAGS=-pedantic -ffast-math $(CWARNINGS) ++CXXFLAGS+=-pedantic $(CWARNINGS) + #CFLAGS=-O3 -fomit-frame-pointer -ffast-math $(CWARNINGS) +-CFLAGS=-O -g $(CWARNINGS) ++CFLAGS+=$(CWARNINGS) -Wstrict-prototypes -Wmissing-prototypes + +-CPPFLAGS=-DVERSION=\"$(VERSION)\" \ ++CPPFLAGS+=-DVERSION=\"$(VERSION)\" \ + -DCONFIG=\"$(CFGDIR)/$(CFGFILE)\" \ + -DBINDIR=\"$(BINDIR)\" $(DEFS) + diff --git a/media-sound/fmdrv/fmdrv-1.0.7.ebuild b/media-sound/fmdrv/fmdrv-1.0.7.ebuild index e4701c3430f5..9cb17380f290 100644 --- a/media-sound/fmdrv/fmdrv-1.0.7.ebuild +++ b/media-sound/fmdrv/fmdrv-1.0.7.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="Console mode MIDI player with builtin userland OPL2 driver" HOMEPAGE="https://bisqwit.iki.fi/source/fmdrv.html" @@ -12,23 +13,21 @@ LICENSE="fmdrv GPL-2" # GPL-2 only SLOT="0" KEYWORDS="amd64 x86" -src_prepare() { - epatch "${FILESDIR}"/${P}-ioperm.patch -} +PATCHES=( + "${FILESDIR}"/${P}-ioperm.patch + "${FILESDIR}"/${P}-fix-makefile.patch +) -src_configure() { :; } # it is a fake +DOCS=( README ) +HTML_DOCS=( README.html ) -src_compile() { - emake fmdrv \ - CC="$(tc-getCC)" CXX="$(tc-getCXX)" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ - LDFLAGS="${LDFLAGS}" +src_configure() { + tc-export AR CC CXX } src_install() { dobin fmdrv - dodoc README - dohtml README.html + einstalldocs } pkg_postinst() { |