projects / feed / packages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: f443d9e)
Merge pull request #9364 from neheb/p11k
authorNikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
Tue, 2 Jul 2019 06:29:13 +0000 (08:29 +0200)
committerGitHub <noreply@github.com>
Tue, 2 Jul 2019 06:29:13 +0000 (08:29 +0200)
p11-kit: Fix compilation with uClibc-ng

libs/pthsem/Makefile patch | blob | history
mail/mutt/Makefile patch | blob | history
multimedia/youtube-dl/Makefile patch | blob | history
net/apinger/Makefile patch | blob | history
net/apinger/patches/001-autoreconf.patch [deleted file] patch | blob | history
net/apinger/patches/002-run_as_user.patch patch | blob | history
net/apinger/patches/003-no_docs.patch patch | blob | history
net/apinger/patches/010-poll.patch [new file with mode: 0644] patch | blob
sound/mpd/Makefile patch | blob | history

diff --git a/libs/pthsem/Makefile b/libs/pthsem/Makefile
index 9ab8a09f6e9cb16257ea6923c3ec2a8ae2b5f483..5ce4f53d68bab5fdbe0673287a8ac99fa482238b 100644 (file)
--- a/libs/pthsem/Makefile
+++ b/libs/pthsem/Makefile
@@ -9,16 +9,16 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pthsem
 PKG_VERSION:=2.0.8
-PKG_RELEASE:=5
-
-PKG_MAINTAINER:=Othmar Truniger <github@truniger.ch>
-PKG_LICENSE:=LGPL-2.1+
-PKG_LICENSE_FILES:=COPYING
+PKG_RELEASE:=6
 
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.auto.tuwien.ac.at/~mkoegler/pth/
 PKG_HASH:=4024cafdd5d4bce2b1778a6be5491222c3f6e7ef1e43971264c451c0012c5c01
 
+PKG_MAINTAINER:=Othmar Truniger <github@truniger.ch>
+PKG_LICENSE:=LGPL-2.1-or-later
+PKG_LICENSE_FILES:=COPYING
+
 PKG_FIXUP:=autoreconf
 PKG_BUILD_PARALLEL:=1
 PKG_FORTIFY_SOURCE:=0
@@ -40,7 +40,7 @@ endef
 
 # The musl libc provides a proper implementation of sigaltstack() so
 # prevent configure from wrongly assuming a broken Linux platform
-ifeq ($(CONFIG_USE_MUSL),y)
+ifneq ($(CONFIG_USE_GLIBC),y)
   CONFIGURE_VARS += \
        ac_cv_check_sjlj=ssjlj
 endif
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index d085dfda55b857691107173860b127336b3926ca..74445114c44a782b4252f8daac867fb88371597d 100644 (file)
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -8,16 +8,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mutt
-PKG_VERSION:=1.12.0
+PKG_VERSION:=1.12.1
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=https://bitbucket.org/mutt/mutt/downloads/ \
                http://ftp.mutt.org/pub/mutt/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_HASH:=ca12448784ed7b6c86d498921e18bc7b152d45494a452df56a7a0c8aaf13f98f
+PKG_HASH:=01c565406ec4ffa85db90b45ece2260b25fac3646cc063bbc20a242c6ed4210c
 
 PKG_MAINTAINER:=Phil Eichinger <phil@zankapfel.net>
-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=GPL
 
 PKG_FIXUP:=autoreconf
diff --git a/multimedia/youtube-dl/Makefile b/multimedia/youtube-dl/Makefile
index 617ba1f5a02e1056f26b68381c69affa3f224fe3..3b6904db6defe1b91238514acfd9e95eb9dc8097 100644 (file)
--- a/multimedia/youtube-dl/Makefile
+++ b/multimedia/youtube-dl/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=youtube-dl
-PKG_VERSION:=2019.6.21
+PKG_VERSION:=2019.6.27
 PKG_RELEASE:=1
 
 PKG_SOURCE:=youtube_dl-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/y/youtube_dl/
-PKG_HASH:=a64ffda79f467c81877d5452d775ebf858b43853ff7ce8644be3a80ebf3f9ea9
+PKG_HASH:=9ffbc02a0a150795f076b6a521fdfe2dad3f3305a8e3a0d29a720c551d4a9a44
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/youtube_dl-$(PKG_VERSION)
 
@@ -41,11 +41,12 @@ endef
 define Package/youtube-dl
 $(call Package/youtube-dl/Default)
   DEPENDS+= \
-       +python3 \
-       +python3-email \
-       +python3-xml \
-       +python3-codecs \
-       +python3-ctypes
+    +python3 \
+    +python3-email \
+    +python3-xml \
+    +python3-codecs \
+    +python3-ctypes \
+    +python3-setuptools
   VARIANT:=python3
 endef
 
diff --git a/net/apinger/Makefile b/net/apinger/Makefile
index e8ae8a81c296ed6869ccd9723766c3f8b56f15b0..f11692c156f398a3c71e756b8302343800a3fc7f 100644 (file)
--- a/net/apinger/Makefile
+++ b/net/apinger/Makefile
@@ -8,23 +8,22 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=apinger
-PKG_VERSION:=0.6.1
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_SOURCE_DATE:=2015-04-09
+PKG_SOURCE_VERSION:=78eb328721ba1a10571c19df95acd
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/Jajcus/apinger.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=c7da72f7ec26eedd7fd8d224c0e10787b204f94e
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=c6739bef32568877ad63dbfa8e34b617a287e225a0344d4c41ba891e1f25d487
+PKG_SOURCE_URL:=https://github.com/Jajcus/apinger
+PKG_MIRROR_HASH:=4ada1330fc5d0adc0216d141f5e3b494df7a4c6500bbffce1efeab3d58684f7e
 
 PKG_MAINTAINER:=Alex Samorukov <samm@os2.kiev.ua>
-PKG_LICENSE:= GPL-2.0
+PKG_LICENSE:=GPL-2.0-only
 
+PKG_REMOVE_FILES:=autogen.sh
 PKG_FIXUP:=autoreconf
 
-PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=0
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -33,7 +32,6 @@ define Package/apinger
   CATEGORY:=Network
   TITLE:=Tool which monitors various IP devices by simple ICMP echo requests
   URL:=https://github.com/Jajcus/apinger
-  PKG_MAINTAINER:=Alex Samorukov <samm@os2.kiev.ua>
 endef
 
 define Package/apinger/description
@@ -51,10 +49,6 @@ define Package/apinger/conffiles
 /etc/apinger.conf
 endef
 
-define Build/Configure
-       $(call Build/Configure/Default)
-endef
-
 define Package/apinger/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/apinger $(1)/usr/sbin/
diff --git a/net/apinger/patches/001-autoreconf.patch b/net/apinger/patches/001-autoreconf.patch
deleted file mode 100644 (file)
index cb5bd45..0000000
--- a/net/apinger/patches/001-autoreconf.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- apinger-0.6.1/acinclude.m4 2003-10-21 12:44:48.000000000 +0000
-+++ apinger-0.6.1/acinclude.m4 2015-04-08 15:27:37.451903960 +0000
-@@ -39,9 +39,7 @@
-               [$jk_inet_includes
- $jk_icmp_includes])
- 
--AC_CHECK_MEMBERS([struct icmp.icmp_type, struct icmp.icmp_code,\
--struct icmp.icmp_cksum, struct icmp.icmp_seq,\
--struct icmp.icmp_id],[],
-+AC_CHECK_MEMBERS([struct icmp.icmp_type, struct icmp.icmp_code,struct icmp.icmp_cksum, struct icmp.icmp_seq,struct icmp.icmp_id],[],
-               AC_MSG_ERROR(struct icmp not defined or not compatible),
-               [$jk_inet_includes
- $jk_icmp_includes])
diff --git a/net/apinger/patches/002-run_as_user.patch b/net/apinger/patches/002-run_as_user.patch
index 16d64acc5f07da5ce477f8aa104798810836ce86..ca36e97a66d0794e16c0043558fe76c6900af426 100644 (file)
--- a/net/apinger/patches/002-run_as_user.patch
+++ b/net/apinger/patches/002-run_as_user.patch
@@ -1,6 +1,6 @@
---- apinger-0.6.1/src/apinger.conf.orig        2015-04-08 16:05:24.558919722 +0000
-+++ apinger-0.6.1/src/apinger.conf     2015-04-08 16:07:47.089170236 +0000
-@@ -9,7 +9,7 @@
+--- a/src/apinger.conf
++++ b/src/apinger.conf
+@@ -8,7 +8,7 @@
  
  ## User and group the pinger should run as
  user "nobody"
diff --git a/net/apinger/patches/003-no_docs.patch b/net/apinger/patches/003-no_docs.patch
index c08f44de7531b44390f89047a3a76826653f8a35..ecfca2d7e9a247ee618a16fdf8fa2a0d14389002 100644 (file)
--- a/net/apinger/patches/003-no_docs.patch
+++ b/net/apinger/patches/003-no_docs.patch
@@ -1,5 +1,5 @@
---- apinger-0.6.1/Makefile.am.orig     2015-04-08 16:47:40.999990050 +0000
-+++ apinger-0.6.1/Makefile.am  2015-04-08 16:48:07.565220137 +0000
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -1,7 +1,7 @@
  
  EXTRA_DIST = autogen.sh TODO BUGS
diff --git a/net/apinger/patches/010-poll.patch b/net/apinger/patches/010-poll.patch
new file mode 100644 (file)
index 0000000..760079e
--- /dev/null
+++ b/net/apinger/patches/010-poll.patch
@@ -0,0 +1,24 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -23,7 +23,7 @@ AC_HEADER_SYS_WAIT
+ AC_CHECK_HEADERS([arpa/inet.h errno.h malloc.h \
+               stddef.h stdlib.h string.h sys/socket.h \
+               sys/time.h syslog.h unistd.h time.h \
+-              assert.h sys/poll.h signal.h pwd.h grp.h stdarg.h\
++              assert.h poll.h signal.h pwd.h grp.h stdarg.h\
+               limits.h sys/wait.h sched.h sys/ioctl.h sys/uio.h])
+ AC_HEADER_TIME
+ 
+--- a/src/apinger.c
++++ b/src/apinger.c
+@@ -33,8 +33,8 @@
+ #ifdef HAVE_SYS_WAIT_H
+ # include <sys/wait.h>
+ #endif
+-#ifdef HAVE_SYS_POLL_H
+-# include <sys/poll.h>
++#ifdef HAVE_POLL_H
++# include <poll.h>
+ #endif
+ #ifdef HAVE_ARPA_INET_H
+ # include <arpa/inet.h>
diff --git a/sound/mpd/Makefile b/sound/mpd/Makefile
index 6a56ca22441a9014b670c496efd300072b9113ce..cf3d291bdc574b2f7c22537be2f6913f1102a4f2 100644 (file)
--- a/sound/mpd/Makefile
+++ b/sound/mpd/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mpd
 PKG_VERSION:=0.20.23
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://www.musicpd.org/download/mpd/0.20/
@@ -48,7 +48,7 @@ endef
 define Package/mpd-full
 $(call Package/mpd/Default)
   TITLE+= (full)
-  DEPENDS+= +libffmpeg +libid3tag +libmms +libupnp +libshout
+  DEPENDS+= +libffmpeg +libid3tag +libmms +libupnp +libshout +pulseaudio-daemon
   PROVIDES:=mpd
   VARIANT:=full
 endef
@@ -99,7 +99,7 @@ define Package/mpd-avahi-service/conffiles
 /etc/avahi/services/mpd.service
 endef
 
-EXTRA_LDFLAGS += $(if $(ICONV_FULL),-liconv,-Wl,--whole-archive -liconv -Wl,--no-whole-archive)
+EXTRA_LDFLAGS += $(if $(ICONV_FULL),-liconv,-Wl,--whole-archive -liconv -Wl,--no-whole-archive) -Wl,-rpath-link=$(STAGING_DIR)/usr/lib/pulseaudio
 
 CONFIGURE_ARGS += \
        $(call autoconf_bool,CONFIG_IPV6,ipv6) \
@@ -130,7 +130,6 @@ CONFIGURE_ARGS += \
        --disable-nfs \
        --disable-openal \
        --disable-opus \
-       --disable-pulse \
        --disable-sidplay \
        --disable-smbclient \
        --disable-sndfile \
@@ -166,6 +165,7 @@ ifeq ($(BUILD_VARIANT),full)
        --enable-pipe-output \
        --enable-recorder-output \
        --enable-shout \
+       --enable-pulse \
        --disable-vorbis
 endif
 
@@ -179,6 +179,7 @@ ifeq ($(BUILD_VARIANT),mini)
        --disable-id3 \
        --disable-mms \
        --disable-shout \
+       --disable-pulse \
        --enable-vorbis \
        --with-tremor=yes \
        --disable-recorder-output
Mirror of packages feed