commit: 030daa8375b9719fbbcfe9e5e3a5205208deff19 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Sep 6 16:35:56 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Sep 6 16:45:41 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=030daa83
sci-libs/libsigrok: Drop 0.3.0 Closes: https://bugs.gentoo.org/730490 Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> sci-libs/libsigrok/Manifest | 1 - .../files/libsigrok-0.3.0-configure-flags.patch | 169 --------------------- .../files/libsigrok-0.3.0-no-check-linkage.patch | 30 ---- sci-libs/libsigrok/libsigrok-0.3.0.ebuild | 65 -------- 4 files changed, 265 deletions(-) diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest index a25f3c7b87d..c98a79f5939 100644 --- a/sci-libs/libsigrok/Manifest +++ b/sci-libs/libsigrok/Manifest @@ -1,2 +1 @@ -DIST libsigrok-0.3.0.tar.gz 924503 BLAKE2B 132cc952b7314e11034100973f1086d17515fb7b1eb3792506569211fe05e9f35b113fceaff7c0468ad9be0bbcac0251ae63ae856f1393c51e743983e60886df SHA512 b94e8a8da1346f9ab267fd693975411243f2cb016e48ec05f4ad88a8a1dfe5ed6f5ad4ac4bf0e94dc551dc92cd70d2719983e21abaa4811693fb28a27bf74550 DIST libsigrok-0.5.2.tar.gz 1779465 BLAKE2B fc6fdde1054e9ac50bc42249c34b3dbfff1e89d77f0db5a8762e52fcf2ea5ea69b2defcf1cde4ed7b1edd1e21770002ed661a470c8d666904daa48a84a2bbfc5 SHA512 cf673dad6280302d69050c29490621f66c6d6a73932d019a53ec3501316d3f2e23e7667a04f866dbe6ed73f86a63de73d2173e2b6cea563631d705e06f887092 diff --git a/sci-libs/libsigrok/files/libsigrok-0.3.0-configure-flags.patch b/sci-libs/libsigrok/files/libsigrok-0.3.0-configure-flags.patch deleted file mode 100644 index 16e13349360..00000000000 --- a/sci-libs/libsigrok/files/libsigrok-0.3.0-configure-flags.patch +++ /dev/null @@ -1,169 +0,0 @@ -https://sourceforge.net/p/sigrok/mailman/message/32459490/ - -From de8690fe8aad81f963f14cf1bd7d6e7013d9d747 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <[email protected]> -Date: Fri, 13 Jun 2014 19:09:35 -0400 -Subject: [PATCH] add explicit configure flags for ftdi/serial/usb libraries - -This makes it a lot easier for distros to control this functionality. ---- - configure.ac | 118 +++++++++++++++++++++++++++++++++++++++-------------------- - 1 file changed, 79 insertions(+), 39 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 496bc7a..f23e630 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -261,6 +261,18 @@ AC_ARG_ENABLE(zeroplus-logic-cube, - [HW_ZEROPLUS_LOGIC_CUBE="$enableval"], - [HW_ZEROPLUS_LOGIC_CUBE=$HW_ENABLED_DEFAULT]) - -+AC_ARG_ENABLE(libserialport, -+ AC_HELP_STRING([--disable-libserialport], -+ [disable libserialport support [default=detect]])) -+ -+AC_ARG_ENABLE(libftdi, -+ AC_HELP_STRING([--disable-libftdi], -+ [disable libftdi support [default=detect]])) -+ -+AC_ARG_ENABLE(libusb, -+ AC_HELP_STRING([--disable-libusb], -+ [disable libusb support [default=detect]])) -+ - # Checks for libraries. - - case "$host" in -@@ -302,19 +314,28 @@ PKG_CHECK_MODULES([libzip], [libzip >= 0.10], - - # libserialport is only needed for some hardware drivers. Disable the - # respective drivers if it is not found. --PKG_CHECK_MODULES([libserialport], [libserialport >= 0.1.0], -- [have_libserialport="yes"; LIB_CFLAGS="$LIB_CFLAGS $libserialport_CFLAGS"; -- LIBS="$LIBS $libserialport_LIBS"; -- SR_PKGLIBS="$SR_PKGLIBS libserialport"], -- [have_libserialport="no"; HW_AGILENT_DMM="no"; HW_APPA_55II="no"; -+if test "x$enable_libserialport" != "xno"; then -+ PKG_CHECK_MODULES([libserialport], [libserialport >= 0.1.0], -+ [have_libserialport="yes"; LIB_CFLAGS="$LIB_CFLAGS $libserialport_CFLAGS"; -+ LIBS="$LIBS $libserialport_LIBS"; -+ SR_PKGLIBS="$SR_PKGLIBS libserialport"], -+ [have_libserialport="no"]) -+ if test "x$enable_libserialport$have_libserialport" = "xyesno"; then -+ AC_MSG_ERROR([libserialport support requested, but it was not found]) -+ fi -+else -+ have_libserialport="no" -+fi -+ -+# Define HAVE_LIBSERIALPORT in config.h if we found libserialport. -+if test "x$have_libserialport" = "xno"; then -+ HW_AGILENT_DMM="no"; HW_APPA_55II="no"; - HW_ATTEN_PPS3XXX="no"; HW_BRYMEN_DMM="no"; HW_CEM_DT_885X="no"; - HW_CENTER_3XX="no"; HW_COLEAD_SLM="no"; HW_CONRAD_DIGI_35_CPU="no"; - HW_FLUKE_DMM="no"; HW_GMC_MH_1X_2X="no"; HW_HAMEG_HMO="no"; - HW_MIC_985XX="no"; HW_NORMA_DMM="no"; HW_OLS="no"; -- HW_SERIAL_DMM="no"; HW_TELEINFO="no"; HW_TONDAJ_SL_814="no"]) -- --# Define HAVE_LIBSERIALPORT in config.h if we found libserialport. --if test "x$have_libserialport" != "xno"; then -+ HW_SERIAL_DMM="no"; HW_TELEINFO="no"; HW_TONDAJ_SL_814="no"; -+else - AC_DEFINE_UNQUOTED(HAVE_LIBSERIALPORT, [1], - [Specifies whether we have libserialport.]) - fi -@@ -340,43 +361,62 @@ fi - - # libusb-1.0 is only needed for some hardware drivers. Disable the respective - # drivers if it is not found. --case "$host" in --*freebsd*) -- # FreeBSD comes with an "integrated" libusb-1.0-style USB API. -- # This means libusb-1.0 is always available, no need to check for it, -- # and no need to (potentially) disable any drivers if it's not found. -+if test "x$enable_libusb" != "xno"; then -+ case "$host" in -+ *freebsd*) -+ # FreeBSD comes with an "integrated" libusb-1.0-style USB API. -+ # This means libusb-1.0 is always available, no need to check for it, -+ # and no need to (potentially) disable any drivers if it's not found. -+ have_libusb1_0="yes" -+ ;; -+ *) -+ PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.16], -+ [have_libusb1_0="yes"; LIB_CFLAGS="$LIB_CFLAGS $libusb_CFLAGS"; -+ LIBS="$LIBS $libusb_LIBS"; -+ SR_PKGLIBS="$SR_PKGLIBS libusb-1.0"], -+ [have_libusb1_0="no"]) -+ if test "x$enable_libusb$have_libusb1_0" = "xyesno"; then -+ AC_MSG_ERROR([libusb support requested, but it was not found]) -+ fi -+ ;; -+ esac -+else -+ have_libusb1_0="no" -+fi -+ -+# Define HAVE_LIBUSB_1_0 in config.h if we found libusb-1.0. -+if test "x$have_libusb1_0" = "xno"; then -+ HW_BRYMEN_BM86X="no"; HW_FX2LAFW="no"; -+ HW_HANTEK_DSO="no"; HW_IKALOGIC_SCANALOGIC2="no"; -+ HW_KECHENG_KC_330B="no"; HW_LASCAR_EL_USB="no"; -+ HW_SYSCLK_LWLA="no"; HW_UNI_T_DMM="no"; -+ HW_UNI_T_UT32X="no"; HW_VICTOR_DMM="no"; -+ HW_ZEROPLUS_LOGIC_CUBE="no"; HW_SALEAE_LOGIC16="no"; -+else - AC_DEFINE_UNQUOTED(HAVE_LIBUSB_1_0, [1], - [Specifies whether we have a libusb.h header.]) -- ;; --*) -- PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.16], -- [have_libusb1_0="yes"; LIB_CFLAGS="$LIB_CFLAGS $libusb_CFLAGS"; -- LIBS="$LIBS $libusb_LIBS"; -- SR_PKGLIBS="$SR_PKGLIBS libusb-1.0"], -- [have_libusb1_0="no"; HW_BRYMEN_BM86X="no"; HW_FX2LAFW="no"; -- HW_HANTEK_DSO="no"; HW_IKALOGIC_SCANALOGIC2="no"; -- HW_KECHENG_KC_330B="no"; HW_LASCAR_EL_USB="no"; -- HW_SYSCLK_LWLA="no"; HW_UNI_T_DMM="no"; -- HW_UNI_T_UT32X="no"; HW_VICTOR_DMM="no"; -- HW_ZEROPLUS_LOGIC_CUBE="no"; HW_SALEAE_LOGIC16="no"]) -- -- # Define HAVE_LIBUSB_1_0 in config.h if we found libusb-1.0. -- if test "x$have_libusb1_0" != "xno"; then -- AC_DEFINE_UNQUOTED(HAVE_LIBUSB_1_0, [1], -- [Specifies whether we have a libusb.h header.]) -- fi -- ;; --esac -+fi - - # USB + FX2 firmware helper code is only compiled in if libusb-1.0 was found. - AM_CONDITIONAL(NEED_USB, test "x$have_libusb1_0" != xno) - - # libftdi is only needed for some hardware drivers. Disable them if not found. --PKG_CHECK_MODULES([libftdi], [libftdi >= 0.16], -- [LIB_CFLAGS="$LIB_CFLAGS $libftdi_CFLAGS"; -- LIBS="$LIBS $libftdi_LIBS"; -- SR_PKGLIBS="$SR_PKGLIBS libftdi"], -- [HW_ASIX_SIGMA="no"; HW_CHRONOVU_LA="no"; HW_IKALOGIC_SCANAPLUS="no"]) -+if test "x$enable_libftdi" != "xno"; then -+ PKG_CHECK_MODULES([libftdi], [libftdi >= 0.16], -+ [have_libftdi="yes"; LIB_CFLAGS="$LIB_CFLAGS $libftdi_CFLAGS"; -+ LIBS="$LIBS $libftdi_LIBS"; -+ SR_PKGLIBS="$SR_PKGLIBS libftdi"], -+ [have_libftdi="no"]) -+ if test "x$enable_libftdi$have_libftdi" = "xyesno"; then -+ AC_MSG_ERROR([libftdi support requested, but it was not found]) -+ fi -+else -+ have_libftdi="no" -+fi -+ -+if test "x$have_libftdi" = "xno"; then -+ HW_ASIX_SIGMA="no"; HW_CHRONOVU_LA="no"; HW_IKALOGIC_SCANAPLUS="no"; -+fi - - # The Check unit testing framework is optional. Disable if not found. - PKG_CHECK_MODULES([check], [check >= 0.9.4], --- -2.0.0 - diff --git a/sci-libs/libsigrok/files/libsigrok-0.3.0-no-check-linkage.patch b/sci-libs/libsigrok/files/libsigrok-0.3.0-no-check-linkage.patch deleted file mode 100644 index f638c47b196..00000000000 --- a/sci-libs/libsigrok/files/libsigrok-0.3.0-no-check-linkage.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://sourceforge.net/p/sigrok/mailman/message/32459488/ - -From 5326833697a73826babb6a43c74112da7368d2d6 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <[email protected]> -Date: Fri, 13 Jun 2014 21:17:23 -0400 -Subject: [PATCH] do not add check to common cflags/libs - -Only the unittests use these flags, so don't go linking them in for -the main library too. ---- - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f23e630..d0654f1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -420,8 +420,7 @@ fi - - # The Check unit testing framework is optional. Disable if not found. - PKG_CHECK_MODULES([check], [check >= 0.9.4], -- [have_check="yes"; LIB_CFLAGS="$LIB_CFLAGS $check_CFLAGS"; -- LIBS="$LIBS $check_LIBS"], [have_check="no"]) -+ [have_check="yes"], [have_check="no"]) - AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes") - - # The OLS driver uses serial port file descriptors directly, and therefore --- -2.0.0 - diff --git a/sci-libs/libsigrok/libsigrok-0.3.0.ebuild b/sci-libs/libsigrok/libsigrok-0.3.0.ebuild deleted file mode 100644 index 3c1c6c14e61..00000000000 --- a/sci-libs/libsigrok/libsigrok-0.3.0.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils autotools ltprune - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="git://sigrok.org/${PN}" - inherit git-r3 autotools -else - SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"; - KEYWORDS="amd64 x86" -fi - -DESCRIPTION="basic hardware drivers for logic analyzers and input/output file format support" -HOMEPAGE="https://sigrok.org/wiki/Libsigrok"; - -LICENSE="GPL-3" -SLOT="0/2" -IUSE="ftdi serial static-libs test usb" -RESTRICT="!test? ( test )" - -# We also support librevisa, but that isn't in the tree ... -LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)] - >=dev-libs/libzip-0.8:=[static-libs(+)] - ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] ) - serial? ( >=dev-libs/libserialport-0.1.0[static-libs(+)] ) - usb? ( virtual/libusb:1[static-libs(+)] )" -RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} ) - static-libs? ( ${LIB_DEPEND} )" -DEPEND="${LIB_DEPEND//\[static-libs(+)]} - test? ( >=dev-libs/check-0.9.4 ) - virtual/pkgconfig" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.3.0-configure-flags.patch - epatch "${FILESDIR}"/${PN}-0.3.0-no-check-linkage.patch - eautoreconf - - # Deal with libftdi-0.x & libftdi-1.x changes. - if has_version dev-embedded/libftdi:1 ; then - sed -i 's:libftdi >= 0.16:libftdi1 >= 0.16:g' configure || die - fi - - # Fix implicit decl w/usleep. - sed -i '1i#include <unistd.h>' hardware/asix-sigma/asix-sigma.c || die -} - -src_configure() { - econf \ - $(use_enable ftdi libftdi) \ - $(use_enable serial libserialport) \ - $(use_enable usb libusb) \ - $(use_enable static-libs static) -} - -src_test() { - emake check -} - -src_install() { - default - prune_libtool_files -}
