app-shells/schily-tools: Version bump. media-video/avinfo: Patch -fno-common

Signed-off-by: Martin Väth <martin@mvath.de>

5 files changed, 30 insertions, 4 deletions

diff --git a/app-shells/schily-tools/Manifest b/app-shells/schily-tools/Manifest
index c8d1e86e..2d9e9f1a 100644
--- a/app-shells/schily-tools/Manifest
+++ b/app-shells/schily-tools/Manifest
@@ -1 +1 @@
-DIST schily-2020-03-27.tar.bz2 4417889 SHA512 102f1f8fd7598fe219d68aa87211872ec3fbe25391ba68116cdb3f666196b575c5af64d8979c0d12d16962a9e9bf71646b92b62d7f2dd4d5c88648e5e74ad97f
+DIST schily-2020-05-11.tar.bz2 4783976 SHA512 a12f0a3caa14c35af150afb4354fbe7c5b1d6ad301d24efbed6f0ec7c38919fe2bf863a117d46107178d11f60b9dd93f72f173c722e2e129d86d348b01fc56ee
diff --git a/app-shells/schily-tools/schily-tools-2020.03.27.ebuild b/app-shells/schily-tools/schily-tools-2020.05.11.ebuild
index 64fc15b9..64fc15b9 100644
--- a/app-shells/schily-tools/schily-tools-2020.03.27.ebuild
+++ b/app-shells/schily-tools/schily-tools-2020.05.11.ebuild
diff --git a/media-video/avinfo/avinfo-1.0_alpha15_p1.ebuild b/media-video/avinfo/avinfo-1.0_alpha15_p1-r1.ebuild
index c182587c..54a83441 100644
--- a/media-video/avinfo/avinfo-1.0_alpha15_p1.ebuild
+++ b/media-video/avinfo/avinfo-1.0_alpha15_p1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors and Martin V\"ath
+# Copyright 1999-2020 Gentoo Authors and Martin V\"ath
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,6 +22,7 @@ S="${WORKDIR}"/${PN}-1.0.a15
 src_prepare() {
 	eapply "${WORKDIR}"/${MY_P}-patch1/${MY_P}-patch1.diff
 	eapply "${FILESDIR}"/no-bison.patch
+	eapply "${FILESDIR}"/no-common.patch
 	sed -i -e 's/$(CC) $(OBJ)/$(CC) $(LDFLAGS) $(OBJ)/' src/Makefile || die
 	default
 }
diff --git a/media-video/avinfo/files/no-common.patch b/media-video/avinfo/files/no-common.patch
new file mode 100644
index 00000000..32ac9a99
--- /dev/null
+++ b/media-video/avinfo/files/no-common.patch
@@ -0,0 +1,25 @@
+--- 1/src/avinfo.h
++++ 1/src/avinfo.h
+@@ -35,11 +35,11 @@
+ 	V_aspectX,
+ 	V_aspectY,
+ 	V_exist
+-}video_enum;
++};
+ 
+ #define VIDEO_INFO_SIZE (V_exist+1)
+ 
+-enum{
++enum audio_enum{
+ 	A_l,
+ 	A_bits,
+ 	A_cc,
+@@ -48,7 +48,7 @@
+ 	A_ch,
+ 	A_freq,
+ 	A_exist
+-}audio_enum;
++};
+ 
+ 
+ #define AUDIO_INFO_SIZE (A_exist+1)
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index d05103ae..22eba74f 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -39,7 +39,7 @@ app-shells/oh-my-zsh 99999999: A ready-to-use zsh configuration with plugins
 app-shells/push 3.1-r4: A POSIX shell function to treat a variable like an array, quoting args
 app-shells/quoter 4.1-r1: Quote arguments or standard input for usage in POSIX shell by eval
 app-shells/runtitle 2.10: Scripts to run commands and set the hard status line (windows title)
-app-shells/schily-tools 2020.03.27: Many tools from Joerg Schilling, including a POSIX compliant Bourne Shell
+app-shells/schily-tools 2020.05.11: Many tools from Joerg Schilling, including a POSIX compliant Bourne Shell
 app-shells/set_prompt 3.1: An intelligent prompt for zsh or bash with status line (window title) support
 app-shells/termcolors-mv 4.7-r1: 256colors sample script and dircolors configuration for standard or 256 colors
 app-shells/zsh-autosuggestions 0.6.4 99999999: Fish-like autosuggestions for zsh
@@ -82,7 +82,7 @@ media-tv/nvtv 0.4.7-r3: TV-Out for NVidia cards
 media-tv/sundtek-tv 200325.155550: Sundtek MediaTV Pro III Drivers
 media-tv/w_scan 20170107-r1: Scan for DVB-C/DVB-T/DVB-S channels without prior knowledge of frequencies
 media-video/avidemux 2.7.4-r1: Video editor designed for simple cutting, filtering and encoding tasks
-media-video/avinfo 1.0_alpha15_p1: Utility for displaying AVI information
+media-video/avinfo 1.0_alpha15_p1-r1: Utility for displaying AVI information
 media-video/video-mv 16.2: Frontends for using mplayer/mencoder, ffmpeg/libav, or tzap as video recorder
 net-dialup/accounting 1.60.45.3.1-r1: Give statistics about dialup connections. Originally part of SuSE's smpppd
 net-dialup/martian-modem 20100123-r3: ltmodem alternative driver providing support for Agere Systems winmodems