diff options
20 files changed, 528 insertions, 168 deletions
diff --git a/app-i18n/imsettings/files/imsettings-1.7.2-fno-common.patch b/app-i18n/imsettings/files/imsettings-1.7.2-fno-common.patch new file mode 100644 index 000000000000..0845bd31820a --- /dev/null +++ b/app-i18n/imsettings/files/imsettings-1.7.2-fno-common.patch @@ -0,0 +1,11 @@ +--- a/imsettings-daemon/imsettings-server.c ++++ b/imsettings-daemon/imsettings-server.c +@@ -93,7 +93,7 @@ GDBusInterfaceVTable __iface_vtable = { + NULL, + NULL, + }; +-guint signals[LAST_SIGNAL]; ++extern guint signals[LAST_SIGNAL]; + + G_DEFINE_TYPE (IMSettingsServer, imsettings_server, G_TYPE_OBJECT); + G_LOCK_DEFINE_STATIC (logger); diff --git a/app-i18n/imsettings/imsettings-1.7.2.ebuild b/app-i18n/imsettings/imsettings-1.7.2.ebuild index f2f473de2fa8..789cc72bb3e2 100644 --- a/app-i18n/imsettings/imsettings-1.7.2.ebuild +++ b/app-i18n/imsettings/imsettings-1.7.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 -inherit autotools xdg-utils +inherit autotools DESCRIPTION="Delivery framework for general Input Method configuration" HOMEPAGE="https://tagoh.bitbucket.io/imsettings" @@ -12,7 +12,7 @@ SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="amd64 ~x86" -IUSE="gconf gtk2 qt5 +introspection static-libs xfconf" +IUSE="gconf gtk2 qt5 +introspection xfconf" RESTRICT="test" RDEPEND="dev-libs/glib:2 @@ -26,7 +26,8 @@ RDEPEND="dev-libs/glib:2 !gtk2? ( x11-libs/gtk+:3 ) introspection? ( dev-libs/gobject-introspection ) xfconf? ( xfce-base/xfconf )" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" dev-util/glib-utils dev-util/intltool sys-devel/autoconf-archive @@ -35,6 +36,8 @@ DEPEND="${RDEPEND} MY_XINPUTSH="90-xinput" +PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) + src_prepare() { sed -i \ -e "/PKG_CHECK_MODULES/s/\(gconf-2\.0\)/$(usex gconf '\1' _)/" \ @@ -49,18 +52,17 @@ src_prepare() { default eautoreconf - xdg_environment_reset } src_configure() { econf \ - $(use_enable static-libs static) \ + --disable-static \ --with-xinputsh=${MY_XINPUTSH} } src_install() { default - find "${D}" -name '*.la' -delete || die + find "${ED}" -name '*.la' -delete || die fperms 0755 /etc/X11/xinit/xinitrc.d/${MY_XINPUTSH} } diff --git a/dev-embedded/libftdi/libftdi-1.4.ebuild b/dev-embedded/libftdi/libftdi-1.4-r1.ebuild index 64b53c03c616..ff35d3bfef0c 100644 --- a/dev-embedded/libftdi/libftdi-1.4.ebuild +++ b/dev-embedded/libftdi/libftdi-1.4-r1.ebuild @@ -1,18 +1,19 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8,9} ) -inherit cmake-utils python-single-r1 +PYTHON_COMPAT=( python3_{6..9} ) +inherit cmake python-single-r1 -MY_P="${PN}1-${PV}" if [[ ${PV} == 9999* ]] ; then inherit git-r3 EGIT_REPO_URI="git://developer.intra2net.com/${PN}" else + MY_P="${PN}1-${PV}" SRC_URI="https://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2" KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 sparc x86" + S=${WORKDIR}/${MY_P} fi DESCRIPTION="Userspace access to FTDI USB interface chips" @@ -20,52 +21,52 @@ HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/" LICENSE="LGPL-2" SLOT="1" -IUSE="cxx doc examples python static-libs test tools" +IUSE="cxx doc examples python test tools" RESTRICT="!test? ( test )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RDEPEND="virtual/libusb:1 +RDEPEND=" + virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( ${PYTHON_DEPS} ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse:= )" -DEPEND="${RDEPEND} - python? ( dev-lang/swig ) - doc? ( app-doc/doxygen )" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( app-doc/doxygen ) + python? ( dev-lang/swig )" pkg_setup() { use python && python-single-r1_pkg_setup } -S=${WORKDIR}/${MY_P} - src_configure() { local mycmakeargs=( -DFTDIPP=$(usex cxx) -DDOCUMENTATION=$(usex doc) -DEXAMPLES=$(usex examples) -DPYTHON_BINDINGS=$(usex python) - -DSTATICLIBS=$(usex static-libs) -DBUILD_TESTS=$(usex test) -DFTDI_EEPROM=$(usex tools) + -DSTATICLIBS=OFF -DCMAKE_SKIP_BUILD_RPATH=ON ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install use python && python_optimize dodoc AUTHORS ChangeLog README TODO if use doc ; then # Clean up crap man pages. #356369 - rm -vf "${CMAKE_BUILD_DIR}"/doc/man/man3/_* || die + rm -vf "${BUILD_DIR}"/doc/man/man3/_* || die - doman "${CMAKE_BUILD_DIR}"/doc/man/man3/* - dodoc -r "${CMAKE_BUILD_DIR}"/doc/html + doman "${BUILD_DIR}"/doc/man/man3/* + dodoc -r "${BUILD_DIR}"/doc/html fi if use examples ; then docinto examples diff --git a/dev-embedded/libftdi/libftdi-1.5.ebuild b/dev-embedded/libftdi/libftdi-1.5.ebuild index d5d1fe185434..cd5cc4c3539f 100644 --- a/dev-embedded/libftdi/libftdi-1.5.ebuild +++ b/dev-embedded/libftdi/libftdi-1.5.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8,9} ) +PYTHON_COMPAT=( python3_{6..9} ) inherit cmake python-single-r1 MY_P="${PN}1-${PV}" @@ -21,15 +21,15 @@ S="${WORKDIR}/${MY_P}" LICENSE="LGPL-2" SLOT="1" -IUSE="cxx doc examples python static-libs test tools" +IUSE="cxx doc examples python test tools" RESTRICT="!test? ( test )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" BDEPEND=" doc? ( app-doc/doxygen ) - python? ( dev-lang/swig ) -" -RDEPEND="virtual/libusb:1 + python? ( dev-lang/swig )" +RDEPEND=" + virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( ${PYTHON_DEPS} ) tools? ( @@ -40,9 +40,7 @@ DEPEND="${RDEPEND} test? ( dev-libs/boost ) " -PATCHES=( - "${FILESDIR}/${P}-tests-no-cxx.patch" -) +PATCHES=( "${FILESDIR}"/${P}-tests-no-cxx.patch ) pkg_setup() { use python && python-single-r1_pkg_setup @@ -54,10 +52,10 @@ src_configure() { -DDOCUMENTATION=$(usex doc) -DEXAMPLES=$(usex examples) -DPYTHON_BINDINGS=$(usex python) - -DSTATICLIBS=$(usex static-libs) -DBUILD_TESTS=$(usex test) -DFTDI_EEPROM=$(usex tools) -DCMAKE_SKIP_BUILD_RPATH=ON + -DSTATICLIBS=OFF ) cmake_src_configure } diff --git a/dev-embedded/libftdi/libftdi-9999.ebuild b/dev-embedded/libftdi/libftdi-9999.ebuild index ac06a98e9188..984ebde256da 100644 --- a/dev-embedded/libftdi/libftdi-9999.ebuild +++ b/dev-embedded/libftdi/libftdi-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8,9} ) +PYTHON_COMPAT=( python3_{6..9} ) inherit cmake python-single-r1 MY_P="${PN}1-${PV}" @@ -21,15 +21,15 @@ S="${WORKDIR}/${MY_P}" LICENSE="LGPL-2" SLOT="1" -IUSE="cxx doc examples python static-libs test tools" +IUSE="cxx doc examples python test tools" RESTRICT="!test? ( test )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" BDEPEND=" doc? ( app-doc/doxygen ) - python? ( dev-lang/swig ) -" -RDEPEND="virtual/libusb:1 + python? ( dev-lang/swig )" +RDEPEND=" + virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( ${PYTHON_DEPS} ) tools? ( @@ -50,10 +50,10 @@ src_configure() { -DDOCUMENTATION=$(usex doc) -DEXAMPLES=$(usex examples) -DPYTHON_BINDINGS=$(usex python) - -DSTATICLIBS=$(usex static-libs) -DBUILD_TESTS=$(usex test) -DFTDI_EEPROM=$(usex tools) -DCMAKE_SKIP_BUILD_RPATH=ON + -DSTATICLIBS=OFF ) cmake_src_configure } diff --git a/dev-libs/shhopt/files/shhopt-1.1.7-build.patch b/dev-libs/shhopt/files/shhopt-1.1.7-build.patch index 3405511e2238..954011994bc9 100644 --- a/dev-libs/shhopt/files/shhopt-1.1.7-build.patch +++ b/dev-libs/shhopt/files/shhopt-1.1.7-build.patch @@ -1,12 +1,12 @@ --- a/Makefile +++ b/Makefile -@@ -5,20 +5,15 @@ +@@ -5,17 +5,11 @@ VERPAT = 7 VERSION = $(VERMAJ).$(VERMIN).$(VERPAT) -# Define SHARED as 1 for Linux shared ELF library -#SHARED = 1 -- + -ifeq ($(SHARED),1) LIBTARGET = lib$(DIST).so.$(VERSION) LIBTARGETSO = lib$(DIST).so @@ -15,69 +15,55 @@ -else -LIBTARGET = lib$(DIST).a -endif -+ -+LIBTARGETA = lib$(DIST).a LIBHEAD = $(DIST).h --TARGETS = $(LIBTARGET) -+TARGETS = $(LIBTARGET) $(LIBTARGETA) - - INSTBASEDIR = /usr/local - INSTLIBDIR = $(INSTBASEDIR)/lib -@@ -27,12 +22,12 @@ + TARGETS = $(LIBTARGET) +@@ -27,12 +21,9 @@ INSTALLPROG = install -m 755 MKDIRP = install -d -m 755 -CC = gcc -OPTIM = -O2 - --INCDIR = -I. -- + INCDIR = -I. + -CCOPT = -s -Wall $(OPTIM) $(INCDIR) -+CC ?= gcc -+AR ?= ar -+ARFLAGS ?= rc -+RANLIB ?= ranlib -+CPPFLAGS += -I. -+CFLAGS += -Wall ++CCOPT = -Wall $(INCDIR) # Object files to store in the library LIBOBJS = shhopt.o -@@ -43,21 +38,19 @@ - # don't worry if you get ranlib not found errors. This probably means +@@ -44,12 +35,7 @@ # that your ar does an implicit ranlib and you do not need to run ranlib # separately. This error is harmless. --$(LIBTARGET): $(LIBOBJS) + $(LIBTARGET): $(LIBOBJS) -ifeq ($(SHARED),1) - $(CC) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGET) $(LIBOBJS) -else - ar rc $(LIBTARGET) $(LIBOBJS) - ranlib $(LIBTARGET) || true -endif -+$(LIBTARGET): $(LIBOBJS:.o=.lo) -+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $@ $^ -+$(LIBTARGETA): $(LIBOBJS) -+ $(AR) $(ARFLAGS) $@ $^ -+ $(RANLIB) $@ ++ $(CC) $(LDFLAGS) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGET) $(LIBOBJS) # Note that you may need GNU's -liberty if your libc lacks strtoul example: $(LIBTARGET) example.o - $(CC) -o example example.c \ +@@ -57,7 +43,7 @@ -L. -I. -L$(INSTLIBDIR) -I$(INSTINCDIR) -lshhopt --.c.o: + .c.o: - $(CC) $(CCSHRD) -o $@ -c $(CCOPT) $< -+%.lo: %.c -+ $(COMPILE.c) $(CCSHRD) $^ -o $@ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(CCSHRD) -o $@ -c $(CCOPT) $< depend dep: $(CC) $(INCDIR) -MM *.c >depend -@@ -73,7 +66,7 @@ - endif +@@ -66,11 +52,9 @@ + $(MKDIRP) $(INSTLIBDIR) $(INSTINCDIR) + $(INSTALL) $(LIBTARGET) $(INSTLIBDIR) + $(INSTALL) $(LIBHEAD) $(INSTINCDIR) +-ifeq ($(SHARED),1) + ln -sf $(LIBTARGET) $(INSTLIBDIR)/$(LIBTARGETSOMAJ) + ln -sf $(LIBTARGETSOMAJ) $(INSTLIBDIR)/$(LIBTARGETSO) + echo "Now run ldconfig if necessary." +-endif clean: -- rm -f *.o core *~ depend -+ rm -f *.o *.lo *.so* *.a core *~ depend - - chmod: - chmod a+r * + rm -f *.o core *~ depend diff --git a/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild b/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild index 1d63a8b89ea7..3710e4d865d3 100644 --- a/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild +++ b/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,7 +20,6 @@ src_compile() { } src_install() { - dolib.a libshhopt.a ln -s libshhopt.so.${PV} libshhopt.so || die ln -s libshhopt.so.${PV} libshhopt.so.${PV:0:1} || die dolib.so libshhopt.so* diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest index a4e8eb5d9163..42929ef7e610 100644 --- a/media-libs/mlt/Manifest +++ b/media-libs/mlt/Manifest @@ -1 +1,2 @@ DIST mlt-6.22.1.tar.gz 1343746 BLAKE2B 3178f9af8ee2695df3343d333d03a5e87a22d226915a19c90dd78bbe66684984d37549ef53e6583152b5f44267d0e908e6f887f18fb02289cc31e8c8b1520ddb SHA512 c620b68d35c90eab650c70768a4ae631dec83ece6dd3fd8e09f9300d837d8e0f3da1b098786188f9c1216800f848dd5db7c9e5fa03e816fba3fbcf3c63324c74 +DIST mlt-6.24.0.tar.gz 1351427 BLAKE2B ea645f0fc6822c0fe3012ac4833062dcddff9859e35fc41aacd929c2dc0c80b49bb83b7714d234e0bcad9a4e300534e8637b1e6927c99cb84e9ce2959e619a7b SHA512 c9533191aad7be894152e305a4ce3f8c1dbd652ea887774866c74aed4794eae90bd15b0b9a070e6fc22f2979e210af6ca1a2c937adcc3b0be5d39ba900df6229 diff --git a/media-libs/mlt/mlt-6.24.0.ebuild b/media-libs/mlt/mlt-6.24.0.ebuild new file mode 100644 index 000000000000..d9701907cf5a --- /dev/null +++ b/media-libs/mlt/mlt-6.24.0.ebuild @@ -0,0 +1,233 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..4} luajit ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) +inherit lua python-single-r1 qmake-utils toolchain-funcs + +DESCRIPTION="Open source multimedia framework for television broadcasting" +HOMEPAGE="https://www.mltframework.org/" +SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg +fftw frei0r gtk jack kdenlive kernel_linux libsamplerate lua melt opencv opengl python +qt5 rtaudio sdl vdpau vidstab xine xml" +# java perl php tcl + +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} )" + +SWIG_DEPEND=">=dev-lang/swig-2.0" +# java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 ) +# perl? ( ${SWIG_DEPEND} ) +# php? ( ${SWIG_DEPEND} ) +# tcl? ( ${SWIG_DEPEND} ) +# ruby? ( ${SWIG_DEPEND} ) +BDEPEND=" + virtual/pkgconfig + compressed-lumas? ( virtual/imagemagick-tools[png] ) + lua? ( ${SWIG_DEPEND} virtual/pkgconfig ) + python? ( ${SWIG_DEPEND} ) +" +#rtaudio will use OSS on non linux OSes +DEPEND=" + >=media-libs/libebur128-1.2.2:= + ffmpeg? ( media-video/ffmpeg:0=[vdpau?,-flite] ) + fftw? ( sci-libs/fftw:3.0= ) + frei0r? ( media-plugins/frei0r-plugins ) + gtk? ( + media-libs/libexif + x11-libs/pango + ) + jack? ( + >=dev-libs/libxml2-2.5 + media-libs/ladspa-sdk + virtual/jack + ) + libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) + lua? ( ${LUA_DEPS} ) + opencv? ( >=media-libs/opencv-3.2.0:= ) + opengl? ( media-video/movit ) + python? ( ${PYTHON_DEPS} ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + media-libs/libexif + x11-libs/libX11 + ) + rtaudio? ( + >=media-libs/rtaudio-4.1.2 + kernel_linux? ( media-libs/alsa-lib ) + ) + sdl? ( + media-libs/libsdl2[X,opengl,video] + media-libs/sdl2-image + ) + vidstab? ( media-libs/vidstab ) + xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) + xml? ( >=dev-libs/libxml2-2.5 )" +# java? ( >=virtual/jre-1.5 ) +# perl? ( dev-lang/perl ) +# php? ( dev-lang/php ) +# ruby? ( ${RUBY_DEPS} ) +# sox? ( media-sound/sox ) +# tcl? ( dev-lang/tcl:0= ) +RDEPEND="${DEPEND}" + +DOCS=( AUTHORS NEWS README docs/{framework,melt,mlt{++,-xml}}.txt ) + +PATCHES=( + "${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch + "${FILESDIR}"/${PN}-6.22.1-no_lua_bdepend.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + # respect CFLAGS LDFLAGS when building shared libraries. Bug #308873 + for x in python lua; do + sed -i "/mlt.so/s/ -lmlt++ /& ${CFLAGS} ${LDFLAGS} /" src/swig/$x/build || die + done + + use python && python_fix_shebang src/swig/python +} + +src_configure() { + tc-export CC CXX + + local myconf=( + --enable-gpl + --enable-gpl3 + --enable-motion-est + --target-arch=$(tc-arch) + --disable-gtk2 + --disable-kde + --disable-sdl + --disable-swfdec + $(use_enable debug) + $(use_enable cpu_flags_x86_sse sse) + $(use_enable cpu_flags_x86_sse2 sse2) + $(use_enable ffmpeg avformat) + $(use_enable fftw plus) + $(use_enable frei0r) + $(use_enable gtk gdk) + $(use_enable jack jackrack) + $(use_enable kdenlive) + $(use_enable libsamplerate resample) + $(use_enable melt) + $(use_enable opencv) + $(use_enable opengl) + $(use_enable qt5 qt) + $(use_enable rtaudio) + $(use_enable sdl sdl2) + $(use_enable vidstab vid.stab) + $(use_enable xine) + $(use_enable xml) + --disable-sox + ) + #$(use_enable sox) FIXME + + use compressed-lumas && myconf+=( --luma-compress ) + use ffmpeg && myconf+=( --avformat-swscale ) + use vdpau && myconf+=( --avformat-vdpau ) + + if use qt5 ; then + myconf+=( + --qt-includedir=$(qt5_get_headerdir) + --qt-libdir=$(qt5_get_libdir) + ) + fi + + if use amd64 || use x86 ; then + myconf+=( $(use_enable cpu_flags_x86_mmx mmx) ) + else + myconf+=( --disable-mmx ) + fi + + if ! use melt ; then + sed -i -e "s;src/melt;;" Makefile || die + fi + + # TODO: add swig language bindings + # see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover + + local swig_lang=() + # not done: java perl php ruby tcl + # handled separately: lua + for i in python; do + use $i && swig_lang+=( $i ) + done + [[ -z "${swig_lang}" ]] && swig_lang=( none ) + + econf "${myconf[@]}" --swig-languages="${swig_lang[*]}" + + sed -i -e s/^OPT/#OPT/ config.mak || die +} + +src_compile() { + default + + if use lua; then + # Only copy sources now to avoid unnecessary rebuilds + lua_copy_sources + + lua_compile() { + pushd "${BUILD_DIR}"/src/swig/lua > /dev/null || die + + sed -i -e "s| mlt_wrap.cxx| $(lua_get_CFLAGS) mlt_wrap.cxx|" build || die + ./build + + popd > /dev/null || die + } + lua_foreach_impl lua_compile + fi +} + +src_install() { + default + + insinto /usr/share/${PN} + doins -r demo + + # + # Install SWIG bindings + # + + docinto swig + + if use lua; then + lua_install() { + pushd "${BUILD_DIR}"/src/swig/lua > /dev/null || die + + exeinto "$(lua_get_cmod_dir)" + doexe mlt.so + + popd > /dev/null || die + } + lua_foreach_impl lua_install + + dodoc "${S}"/src/swig/lua/play.lua + fi + + if use python; then + cd "${S}"/src/swig/python || die + python_domodule mlt.py _mlt.so + chmod +x "${D}$(python_get_sitedir)/_mlt.so" || die + dodoc play.py + python_optimize + fi + + # not done: java perl php ruby tcl +} diff --git a/net-mail/eps/eps-1.7-r1.ebuild b/net-mail/eps/eps-1.7-r1.ebuild index 92434d568c07..40d368deccd5 100644 --- a/net-mail/eps/eps-1.7-r1.ebuild +++ b/net-mail/eps/eps-1.7-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit toolchain-funcs @@ -12,10 +12,8 @@ SRC_URI="http://www.inter7.com/eps/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ppc x86" -IUSE="" -DEPEND="sys-apps/sed" -RDEPEND="" +PATCHES=( "${FILESDIR}"/${P}-static-libs.patch ) src_prepare() { sed -i -e 's:/usr:$(DESTDIR)$(prefix):g' \ diff --git a/net-mail/eps/files/eps-1.7-static-libs.patch b/net-mail/eps/files/eps-1.7-static-libs.patch new file mode 100644 index 000000000000..06fa8bc82559 --- /dev/null +++ b/net-mail/eps/files/eps-1.7-static-libs.patch @@ -0,0 +1,22 @@ +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + CC = gcc + AR = ar + STRIP = strip +-LIB = libeps.a libeps.so ++LIB = libeps.so + + AROPTS = -cru + RANLIB = ranlib +@@ -20,10 +20,6 @@ DEFS = -Wall -I. + + all: $(LIB) + +-libeps.a: $(OBJS) +- $(AR) $(AROPTS) libeps.a $(OBJS) +- $(RANLIB) libeps.a +- + libeps.so: $(OBJS) + $(CC) -shared -o libeps.so $(OBJS) + diff --git a/sci-libs/libccd/Manifest b/sci-libs/libccd/Manifest index 59ed2f7be0f4..6c8f3bc992e9 100644 --- a/sci-libs/libccd/Manifest +++ b/sci-libs/libccd/Manifest @@ -1,2 +1 @@ -DIST libccd-2.0.tar.gz 68103 BLAKE2B 30a91dba9b5dec5edc40d014dd0cba23d75e99f296918b6e58199890508c39813f5170456b1301e9304c433ca3531b1f23c4cdbfc0f20fca21eeafe53991467d SHA512 627426f1acd24779e7d596fd5b18dede4cf3c13d3cceda87a8b2d0195b72d9ada45290fd41baa20d6e3adafda75074db355cb95a60f80023c32b5ad4e72235bf DIST libccd-2.1.tar.gz 73971 BLAKE2B 77feeb42426e72cfc1392351acf84f4c4670ea7f6a555a2b15dd8927e49b855423c4262e319b06774a8d887423238b8d018021ebeba5ee188e52accf5aeb48a1 SHA512 ff037d9c4df50f09600cf9b3514b259b2850ff43f74817853f5665d22812891168f70bd3cc3969b2c9e3c706f6254991a65421476349607fbd04d894b217456d diff --git a/sci-libs/libccd/libccd-2.0.ebuild b/sci-libs/libccd/libccd-2.0.ebuild deleted file mode 100644 index 894309a26239..000000000000 --- a/sci-libs/libccd/libccd-2.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/danfis/libccd" -fi - -inherit ${SCM} cmake-utils toolchain-funcs - -if [ "${PV#9999}" != "${PV}" ] ; then - KEYWORDS="" - SRC_URI="" -else - KEYWORDS="~amd64 ~arm" - SRC_URI="http://libccd.danfis.cz/files/${P}.tar.gz" -fi - -DESCRIPTION="Library for collision detection between two convex shapes" -HOMEPAGE="http://libccd.danfis.cz/" -LICENSE="BSD" -SLOT="0" -IUSE="double doc" - -RDEPEND="" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx )" -DOCS=( README ) - -src_configure() { - local mycmakeargs=( - "-DCCD_DOUBLE=$(usex double TRUE FALSE)" - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - if use doc ; then - cd "${S}/doc" - emake SPHINXBUILD=sphinx-build html - fi -} - -src_test() { - cd src/testsuites - tc-export CC - LDFLAGS="-L${BUILD_DIR} ${LDFLAGS}" \ - LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" \ - emake check -} - -src_install() { - cmake-utils_src_install - use doc && dohtml -r "${S}/doc/_build/html/"* -} diff --git a/sci-libs/libccd/libccd-2.1.ebuild b/sci-libs/libccd/libccd-2.1.ebuild index 8691045954d5..cdc23db29212 100644 --- a/sci-libs/libccd/libccd-2.1.ebuild +++ b/sci-libs/libccd/libccd-2.1.ebuild @@ -5,9 +5,9 @@ EAPI=7 inherit cmake -if [ "${PV}" = "9999" ] ; then +if [[ ${PV} == *9999 ]] ; then inherit git-r3 - EGIT_REPO_URI="https://github.com/danfis/libccd/${PN}.git" + EGIT_REPO_URI="https://github.com/danfis/libccd.git" else SRC_URI="https://github.com/danfis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm" @@ -19,14 +19,10 @@ HOMEPAGE="http://libccd.danfis.cz/ LICENSE="BSD" SLOT="0" -IUSE="+double-precision doc +shared test" +IUSE="+double-precision doc test" RESTRICT="!test? ( test )" -RDEPEND="" - -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx ) -" +BDEPEND="doc? ( dev-python/sphinx )" src_prepare() { # upstream issue 72 @@ -40,11 +36,9 @@ src_prepare() { src_configure() { local mycmakeargs=( -DBUILD_DOCUMENTATION=$(usex doc ON OFF) - -DBUILD_SHARED_LIBS=$(usex shared ON OFF) -DENABLE_DOUBLE_PRECISION=$(usex double-precision ON OFF) ) - local CMAKE_BUILD_TYPE="Release" cmake_src_configure } diff --git a/sci-libs/libccd/libccd-9999.ebuild b/sci-libs/libccd/libccd-9999.ebuild index 6f8c7c9f77b5..8c95229c7747 100644 --- a/sci-libs/libccd/libccd-9999.ebuild +++ b/sci-libs/libccd/libccd-9999.ebuild @@ -5,9 +5,9 @@ EAPI=7 inherit cmake -if [ "${PV}" = "9999" ] ; then +if [[ ${PV} == *9999 ]] ; then inherit git-r3 - EGIT_REPO_URI="https://github.com/danfis/libccd/${PN}.git" + EGIT_REPO_URI="https://github.com/danfis/libccd.git" else SRC_URI="https://github.com/danfis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm" @@ -19,23 +19,17 @@ HOMEPAGE="http://libccd.danfis.cz/ LICENSE="BSD" SLOT="0" -IUSE="+double-precision doc +shared test" +IUSE="+double-precision doc test" RESTRICT="!test? ( test )" -RDEPEND="" - -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx ) -" +BDEPEND="doc? ( dev-python/sphinx )" src_configure() { local mycmakeargs=( -DBUILD_DOCUMENTATION=$(usex doc ON OFF) - -DBUILD_SHARED_LIBS=$(usex shared ON OFF) -DENABLE_DOUBLE_PRECISION=$(usex double-precision ON OFF) ) - local CMAKE_BUILD_TYPE="Release" cmake_src_configure } diff --git a/sci-libs/libccd/metadata.xml b/sci-libs/libccd/metadata.xml index 62004119dcce..8f3764e44754 100644 --- a/sci-libs/libccd/metadata.xml +++ b/sci-libs/libccd/metadata.xml @@ -11,8 +11,6 @@ implements algorithm Minkowski Portal Refinement (MPR, a.k.a. XenoCollide) as described in Game Programming Gems 7. </longdescription> <use> - <flag name="shared">Build shared library</flag> - <flag name="double">Use double precision floats</flag> <flag name="double-precision">More precise calculations at the expense of speed</flag> </use> <upstream> diff --git a/sys-libs/musl-nscd/files/musl-nscd-1.0.2-fno-common.patch b/sys-libs/musl-nscd/files/musl-nscd-1.0.2-fno-common.patch new file mode 100644 index 000000000000..fce44ecdef7d --- /dev/null +++ b/sys-libs/musl-nscd/files/musl-nscd-1.0.2-fno-common.patch @@ -0,0 +1,36 @@ +--- a/include/modules.h ++++ b/include/modules.h +@@ -28,7 +28,7 @@ struct mod_passwd { + link_t link; + }; + +-list_t passwd_mods; +-list_t group_mods; ++extern list_t passwd_mods; ++extern list_t group_mods; + + #endif +--- a/src/main.c ++++ b/src/main.c +@@ -18,6 +18,9 @@ + #include "parse.h" + #include "util.h" + ++list_t passwd_mods; ++list_t group_mods; ++ + static void *get_dll(const char *service) + { + char *path; +--- a/src/socket_handle.c ++++ b/src/socket_handle.c +@@ -19,6 +19,9 @@ + #include "modules.h" + #include "list.h" + ++extern list_t passwd_mods; ++extern list_t group_mods; ++ + static int return_result(int fd, int swap, uint32_t reqtype, void *key); + + struct pthread_args { diff --git a/sys-libs/musl-nscd/musl-nscd-1.0.2.ebuild b/sys-libs/musl-nscd/musl-nscd-1.0.2.ebuild index 6d29e439755c..41e38df7180b 100644 --- a/sys-libs/musl-nscd/musl-nscd-1.0.2.ebuild +++ b/sys-libs/musl-nscd/musl-nscd-1.0.2.ebuild @@ -8,7 +8,7 @@ inherit systemd DESCRIPTION="musl-nscd is an implementation of the NSCD protocol for the musl libc" HOMEPAGE="https://github.com/pikhq/musl-nscd" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == *9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/pikhq/musl-nscd" EGIT_BRANCH=master @@ -25,8 +25,10 @@ DEPEND=" !sys-libs/glibc !sys-libs/uclibc" +PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) + src_prepare() { - eapply_user + default sed -i '/LDFLAGS_AUTO=-s/d' configure || die 'Cannot patch configure file' } diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest index 93154bc9e095..8a4b5fa5d884 100644 --- a/x11-wm/xpra/Manifest +++ b/x11-wm/xpra/Manifest @@ -1,3 +1,4 @@ DIST xpra-3.0.2.tar.xz 2749196 BLAKE2B 3c8745657a12637704fb88ac7b867ab387ef7ed2250396d9e534aecf81e40f85332a2c51ba49638834012f4a4d85c03bd7e49ee259bb2400aeb60fb06abf8b59 SHA512 115f606ff5886d99a906f318cb1a7a4a86e80ebf23e4336e67938267d92ef624de577cc8fc06c6ce541b7c44a0cef58d930b5928f32e24dfc67c72127c7b623c DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647 SHA512 3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681 DIST xpra-4.0.4.tar.xz 2792512 BLAKE2B e16c47e82cf9f8712521c8f9c436b7bb819d9469fc0135ade1f2c9fc6f2a8a0fecf417caae87a1eca9c4b6daec1a82add5d6547208caee1a1d681ebc7b3d3d3b SHA512 91a90cdab775ec2501ef1601188b97ca4aa741e541f8d941add8d509767790a144b67f094177dda7539eff305710f2c834b90a93e9441437dac615677963094c +DIST xpra-4.0.5.tar.xz 2795828 BLAKE2B fed6514d75dbb08f386325e30e375fd2077db1dad91602e575e3955a622a52ade2fc8e0c6c823d8a495684afb3a2f55f27e28abdf8734d0eca25275a3d358193 SHA512 d2aa2b70b6ec702bca5b0c2b06378107d45c4cad79f83ee2a1ed27fd5f66474e2d8e1d28d5111e60417ed089f91bab0b1566b0c9b3dcf6f0cb5e204ff5c42c92 diff --git a/x11-wm/xpra/xpra-4.0.5.ebuild b/x11-wm/xpra/xpra-4.0.5.ebuild new file mode 100644 index 000000000000..49c1939400aa --- /dev/null +++ b/x11-wm/xpra/xpra-4.0.5.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_{6,7,8,9} ) +DISTUTILS_USE_SETUPTOOLS=no +inherit xdg distutils-r1 eutils flag-o-matic tmpfiles prefix + +DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy" +HOMEPAGE="http://xpra.org/ http://xpra.org/src/" +SRC_URI="http://xpra.org/src/${P}.tar.xz" + +LICENSE="GPL-2 BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="brotli +client +clipboard csc cups dbus ffmpeg jpeg +lz4 lzo minimal opengl pillow pulseaudio server sound test vpx webcam webp" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + || ( client server ) + cups? ( dbus ) + opengl? ( client ) +" + +COMMON_DEPEND="${PYTHON_DEPS} + dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] + x11-libs/gtk+:3[introspection] + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libXtst + x11-libs/libxkbfile + brotli? ( app-arch/brotli ) + csc? ( >=media-video/ffmpeg-1.2.2:0= ) + ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] ) + jpeg? ( media-libs/libjpeg-turbo ) + opengl? ( dev-python/pyopengl ) + pulseaudio? ( + media-sound/pulseaudio + media-plugins/gst-plugins-pulse:1.0 + ) + sound? ( media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + dev-python/gst-python:1.0 ) + vpx? ( media-libs/libvpx media-video/ffmpeg ) + webp? ( media-libs/libwebp ) +" +RDEPEND="${COMMON_DEPEND} + acct-group/xpra + dev-python/netifaces[${PYTHON_USEDEP}] + dev-python/rencode[${PYTHON_USEDEP}] + dev-python/pillow[jpeg?,${PYTHON_USEDEP}] + virtual/ssh + x11-apps/xmodmap + cups? ( dev-python/pycups[${PYTHON_USEDEP}] ) + dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) + lz4? ( dev-python/lz4[${PYTHON_USEDEP}] ) + lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] ) + opengl? ( + client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] ) + ) + server? ( x11-base/xorg-server[-minimal,xvfb] + x11-drivers/xf86-input-void + ) + webcam? ( dev-python/numpy[${PYTHON_USEDEP}] + media-libs/opencv[python] + dev-python/pyinotify[${PYTHON_USEDEP}] )" +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig + >=dev-python/cython-0.16[${PYTHON_USEDEP}]" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch + "${FILESDIR}"/${PN}-3.0.2-ldconfig.patch + "${FILESDIR}"/${PN}-4.0.3-suid-warning.patch +) + +pkg_postinst() { + tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf + + xdg_pkg_postinst +} + +python_prepare_all() { + hprefixify -w '/os.path/' setup.py + hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \ + xpra/platform{/xposix,}/paths.py xpra/scripts/server.py + + if use minimal; then + sed -r -e 's/^(pam|scripts|xdg_open)_ENABLED.*/\1_ENABLED=False/' \ + -i setup.py || die + fi + + distutils-r1_python_prepare_all +} + +python_configure_all() { + sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \ + -i setup.py || die + + mydistutilsargs=( + --without-PIC + --without-Xdummy + $(use_with client) + $(use_with clipboard) + $(use_with csc csc_swscale) + --without-csc_libyuv + --without-cuda_rebuild + --without-cuda_kernels + $(use_with cups printing) + --without-debug + $(use_with dbus) + $(use_with ffmpeg dec_avcodec2) + $(use_with ffmpeg enc_ffmpeg) + $(use_with ffmpeg enc_x264) + $(use_with ffmpeg enc_x265) + --with-gtk3 + --without-html5 + $(use_with jpeg jpeg_encoder) + $(use_with jpeg jpeg_decoder) + --without-mdns + --without-minify + $(use_with opengl) + $(use_with server shadow) + $(use_with server) + $(use_with sound) + --with-strict + $(use_with vpx) + --with-warn + $(use_with webcam) + $(use_with webp) + --with-x11 + ) + + # see https://www.xpra.org/trac/ticket/1080 + # and http://trac.cython.org/ticket/395 + append-cflags -fno-strict-aliasing + + export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra" +} |