subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: media\-libs\/flac\/files\/"

[gentoo-commits] repo/gentoo:master commit in: media-libs/flac/files/, media-libs/flac/

2023-08-05 Thread Miroslav Šulc

commit: 84b2534a31ae88191dca37b6c7dde001d0f3be14
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Aug  5 07:16:59 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Aug  5 07:17:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84b2534a

media-libs/flac: dropped obsolete 1.4.2-r1

Bug: https://bugs.gentoo.org/95
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-libs/flac/Manifest   |  1 -
 .../flac-1.4.2-macro-wstrict-prototypes.patch  | 31 ---
 media-libs/flac/flac-1.4.2-r1.ebuild   | 65 --
 3 files changed, 97 deletions(-)

diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index de9a9a448e9e..ec1914cb1563 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -1,3 +1,2 @@
 DIST flac-1.3.4.tar.xz 1038356 BLAKE2B 
0553cd42705f31d6a98d10e8b73953265e97c6b1e46bb59c7d97d12ec1b4aae4c3d6f5e85b9e5d1513f7efac82a65ea9dc59d89d8df0254ff3ab1188039c55c5
 SHA512 
4a626e8a1bd126e234c0e5061e3b46f3a27c2065fdfa228fd8cf00d3c7fa2c05fafb5cec36acce7bfce4914bfd7db0b2a27ee15decf2d8c4caad630f62d44ec9
-DIST flac-1.4.2.tar.xz 1013700 BLAKE2B 
60a40806c6c54fe836235cea2c476051c6f82e6a50ac6d160b4ab783b8b0c33f1763ba2816e5e490acd6320de0764ea3c4b35708820a17f40ccada3f72bac687
 SHA512 
20bdf0990a7432ac765037764bc8733a0d5646866fe6cc6f4868152d2a051c89676e501012ae489c7f87b3aacb45a5b30265afaca164cf0cf53ac058644a74c5
 DIST flac-1.4.3.tar.xz 1006728 BLAKE2B 
c4f441aeaa0493433347b8a110ca01865fd40d5b21150174372af2fee4fa5c3397a67add31138e92999eab9d9abe6c46a5ac29e13cbac60093fbff6d7a672ad3
 SHA512 
3cf095720bd590a588be8ccbe187d22e7a1c60ab85b1d510ce5e8a22ab0a51827b9acfeaad59bbd645a17d1f200f559255a640101b0330709a164306c0e9709e

diff --git a/media-libs/flac/files/flac-1.4.2-macro-wstrict-prototypes.patch 
b/media-libs/flac/files/flac-1.4.2-macro-wstrict-prototypes.patch
deleted file mode 100644
index d836f6aa2206..
--- a/media-libs/flac/files/flac-1.4.2-macro-wstrict-prototypes.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://github.com/xiph/flac/pull/521
-
-From afd9e9006d2c18d184db098bec0a0618cb4f0283 Mon Sep 17 00:00:00 2001
-From: Sam James 
-Date: Wed, 23 Nov 2022 03:31:30 +
-Subject: [PATCH] libFLAC.m4, libFLAC++.m4: fix -Wstrict-prototypes
-
-Signed-off-by: Sam James 
 a/src/libFLAC++/libFLAC++.m4
-+++ b/src/libFLAC++/libFLAC++.m4
-@@ -57,7 +57,7 @@ dnl
- #include 
- #include 
- 
--int main ()
-+int main (void)
- {
-   system("touch conf.libFLAC++test");
-   return 0;
 a/src/libFLAC/libFLAC.m4
-+++ b/src/libFLAC/libFLAC.m4
-@@ -58,7 +58,7 @@ dnl
- #include 
- #include 
- 
--int main ()
-+int main (void)
- {
-   system("touch conf.libFLACtest");
-   return 0;
-

diff --git a/media-libs/flac/flac-1.4.2-r1.ebuild 
b/media-libs/flac/flac-1.4.2-r1.ebuild
deleted file mode 100644
index 33b6ff19fad6..
--- a/media-libs/flac/flac-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib-minimal
-
-DESCRIPTION="Free lossless audio encoder and decoder"
-HOMEPAGE="https://xiph.org/flac/;
-SRC_URI="https://downloads.xiph.org/releases/${PN}/${P}.tar.xz;
-
-LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
-# -
-SLOT="0/10-12"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-IUSE="+cxx debug ogg cpu_flags_ppc_altivec cpu_flags_ppc_vsx 
cpu_flags_x86_avx2 cpu_flags_x86_avx static-libs"
-
-# AVX configure switch is for both AVX & AVX2
-REQUIRED_USE="
-   cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
-"
-
-RDEPEND="ogg? ( media-libs/libogg[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   app-arch/xz-utils
-   sys-devel/gettext
-   virtual/pkgconfig"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.4.2-macro-wstrict-prototypes.patch
-)
-
-multilib_src_configure() {
-   local myeconfargs=(
-   --disable-doxygen-docs
-   --disable-examples
-   $([[ ${CHOST} == *-darwin* ]] && echo 
"--disable-asm-optimizations")
-   $(use_enable cpu_flags_ppc_altivec altivec)
-   $(use_enable cpu_flags_ppc_vsx vsx)
-   $(use_enable cpu_flags_x86_avx avx)
-   $(use_enable cxx cpplibs)
-   $(use_enable debug)
-   $(use_enable ogg)
-   $(use_enable static-libs static)
-
-   # cross-compile fix (bug #521446)
-   # no effect if ogg support is disabled
-   --with-ogg
-   )
-   ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-   if [[ ${UID} != 0 ]]; then
-   emake -j1 check
-   else
-   ewarn "Tests will fail if ran as root, skipping."
-   fi
-}
-
-multilib_src_install_all() {
-   einstalldocs
-   find "${ED}" -type f -name '*.la' -delete || die
-}

[gentoo-commits] repo/gentoo:master commit in: media-libs/flac/files/, media-libs/flac/

2022-02-25 Thread Miroslav Šulc

commit: fa2fb6beb221aa455c16fba7306555e9b79d4853
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Feb 26 07:43:27 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Feb 26 07:43:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa2fb6be

media-libs/flac: removed vulnerable 1.3.3-r1

Bug: https://bugs.gentoo.org/833929
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-libs/flac/Manifest   |  1 -
 ...ac-1.3.3-fix-zero-first-byte-md5sum-check.patch | 13 -
 media-libs/flac/flac-1.3.3-r1.ebuild   | 59 --
 3 files changed, 73 deletions(-)

diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index 7f50cb5c17e8..b8a23c4d2cbe 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -1,2 +1 @@
-DIST flac-1.3.3.tar.xz 1044472 BLAKE2B 
14acf10e5bce54767a8e3c9bfd0b80c388011e35c7e6a814672f8048d5350b4e6f54c6df4f704e611fa4a796fcfcb6aca1ed798f542cd6abe181210f9f6e33f6
 SHA512 
d6417e14fab0c41b2df369e5e39ce62a5f588e491af4d465b0162f74e171e5549b2f061867f344bfbf8aaccd246bf5f2acd697e532a2c7901c920c69429b1a28
 DIST flac-1.3.4.tar.xz 1038356 BLAKE2B 
0553cd42705f31d6a98d10e8b73953265e97c6b1e46bb59c7d97d12ec1b4aae4c3d6f5e85b9e5d1513f7efac82a65ea9dc59d89d8df0254ff3ab1188039c55c5
 SHA512 
4a626e8a1bd126e234c0e5061e3b46f3a27c2065fdfa228fd8cf00d3c7fa2c05fafb5cec36acce7bfce4914bfd7db0b2a27ee15decf2d8c4caad630f62d44ec9

diff --git 
a/media-libs/flac/files/flac-1.3.3-fix-zero-first-byte-md5sum-check.patch 
b/media-libs/flac/files/flac-1.3.3-fix-zero-first-byte-md5sum-check.patch
deleted file mode 100644
index bcad809374e3..
--- a/media-libs/flac/files/flac-1.3.3-fix-zero-first-byte-md5sum-check.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/flac/decode.c b/src/flac/decode.c
-index c26d3f60..bd3f6524 100644
 a/src/flac/decode.c
-+++ b/src/flac/decode.c
-@@ -1307,7 +1307,7 @@ void metadata_callback(const FLAC__StreamDecoder 
*decoder, const FLAC__StreamMet
-   if(metadata->type == FLAC__METADATA_TYPE_STREAMINFO) {
-   FLAC__uint64 skip, until;
-   decoder_session->got_stream_info = true;
--  decoder_session->has_md5sum = 
memcmp(metadata->data.stream_info.md5sum, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 
16);
-+  decoder_session->has_md5sum = 
memcmp(metadata->data.stream_info.md5sum, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 
16) != 0;
-   decoder_session->bps = 
metadata->data.stream_info.bits_per_sample;
-   decoder_session->channels = metadata->data.stream_info.channels;
-   decoder_session->sample_rate = 
metadata->data.stream_info.sample_rate;

diff --git a/media-libs/flac/flac-1.3.3-r1.ebuild 
b/media-libs/flac/flac-1.3.3-r1.ebuild
deleted file mode 100644
index 6dfe898f30c5..
--- a/media-libs/flac/flac-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="free lossless audio encoder and decoder"
-HOMEPAGE="https://xiph.org/flac/;
-SRC_URI="https://downloads.xiph.org/releases/${PN}/${P}.tar.xz;
-
-LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris 
~x86-solaris"
-IUSE="+cxx debug ogg cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_x86_sse 
static-libs"
-
-RDEPEND="ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   app-arch/xz-utils
-   sys-devel/gettext
-   virtual/pkgconfig
-   abi_x86_32? ( dev-lang/nasm )"
-
-PATCHES=( "${FILESDIR}/${P}-fix-zero-first-byte-md5sum-check.patch" )
-
-multilib_src_configure() {
-   local myeconfargs=(
-   --disable-doxygen-docs
-   --disable-examples
-   --disable-xmms-plugin
-   $([[ ${CHOST} == *-darwin* ]] && echo 
"--disable-asm-optimizations")
-   $(use_enable cpu_flags_ppc_altivec altivec)
-   $(use_enable cpu_flags_ppc_vsx vsx)
-   $(use_enable cpu_flags_x86_sse sse)
-   $(use_enable cxx cpplibs)
-   $(use_enable debug)
-   $(use_enable ogg)
-   $(use_enable static-libs static)
-
-   # cross-compile fix (bug #521446)
-   # no effect if ogg support is disabled
-   --with-ogg
-   )
-   ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-   if [[ ${UID} != 0 ]]; then
-   emake -j1 check
-   else
-   ewarn "Tests will fail if ran as root, skipping."
-   fi
-}
-
-multilib_src_install_all() {
-   einstalldocs
-   find "${ED}" -type f -name '*.la' -delete || die
-}

[gentoo-commits] repo/gentoo:master commit in: media-libs/flac/files/

2020-04-05 Thread Andreas Sturmlechner

commit: 96feab60edac2deeae5b463f5e8ae1ea8a5bc118
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr  5 17:24:05 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr  5 17:24:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96feab60

media-libs/flac: Drop unused patches

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../flac/files/flac-1.3.0-dontbuild-tests.patch|  66 
 media-libs/flac/files/flac-1.3.2-asneeded.patch|  39 --
 media-libs/flac/files/flac-1.3.2-cflags.patch  | 398 -
 .../flac/files/flac-1.3.2-dontbuild-examples.patch |  46 ---
 .../flac/files/flac-1.3.2-fortify-sources.patch|  15 -
 .../flac/files/flac-1.3.2-honor-htmldir.patch  |  75 
 6 files changed, 639 deletions(-)

diff --git a/media-libs/flac/files/flac-1.3.0-dontbuild-tests.patch 
b/media-libs/flac/files/flac-1.3.0-dontbuild-tests.patch
deleted file mode 100644
index 0915a597660..000
--- a/media-libs/flac/files/flac-1.3.0-dontbuild-tests.patch
+++ /dev/null
@@ -1,66 +0,0 @@
 flac-1.3.0/src/test_grabbag/cuesheet/Makefile.am
-+++ flac-1.3.0/src/test_grabbag/cuesheet/Makefile.am
-@@ -21,7 +21,7 @@
-   test_cuesheet.vcproj
- 
- AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
--noinst_PROGRAMS = test_cuesheet
-+check_PROGRAMS = test_cuesheet
- test_cuesheet_SOURCES = \
-   main.c
- test_cuesheet_LDADD = \
 flac-1.3.0/src/test_grabbag/picture/Makefile.am
-+++ flac-1.3.0/src/test_grabbag/picture/Makefile.am
-@@ -21,7 +21,7 @@
-   test_picture.vcproj
- 
- AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
--noinst_PROGRAMS = test_picture
-+check_PROGRAMS = test_picture
- test_picture_SOURCES = \
-   main.c
- 
 flac-1.3.0/src/test_libFLAC/Makefile.am
-+++ flac-1.3.0/src/test_libFLAC/Makefile.am
-@@ -22,7 +22,7 @@
- 
- AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include 
-I$(top_srcdir)/src/libFLAC/include
- 
--noinst_PROGRAMS = test_libFLAC
-+check_PROGRAMS = test_libFLAC
- 
- if OS_IS_WINDOWS
- win_utf8_lib = $(top_builddir)/src/share/win_utf8_io/libwin_utf8_io.la
 flac-1.3.0/src/test_libFLAC++/Makefile.am
-+++ flac-1.3.0/src/test_libFLAC++/Makefile.am
-@@ -21,7 +21,7 @@
-   test_libFLAC++.vcproj
- 
- AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
--noinst_PROGRAMS = test_libFLAC++
-+check_PROGRAMS = test_libFLAC++
- test_libFLAC___LDADD = \
-   $(top_builddir)/src/share/grabbag/libgrabbag.la \
-   $(top_builddir)/src/share/replaygain_analysis/libreplaygain_analysis.la 
\
 flac-1.3.0/src/test_seeking/Makefile.am
-+++ flac-1.3.0/src/test_seeking/Makefile.am
-@@ -24,7 +24,7 @@
- 
- AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
- 
--noinst_PROGRAMS = test_seeking
-+check_PROGRAMS = test_seeking
- test_seeking_LDADD = \
-   $(top_builddir)/src/libFLAC/libFLAC.la
- 
 flac-1.3.0/src/test_streams/Makefile.am
-+++ flac-1.3.0/src/test_streams/Makefile.am
-@@ -21,7 +21,7 @@
-   test_streams.vcproj
- 
- AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
--noinst_PROGRAMS = test_streams
-+check_PROGRAMS = test_streams
- test_streams_SOURCES = \
-   main.c
- 

diff --git a/media-libs/flac/files/flac-1.3.2-asneeded.patch 
b/media-libs/flac/files/flac-1.3.2-asneeded.patch
deleted file mode 100644
index f506f243c44..000
--- a/media-libs/flac/files/flac-1.3.2-asneeded.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 8606b0f418c08aaba7f2565b005f9c00f8681ca1 Mon Sep 17 00:00:00 2001
-From: David Seifert 
-Date: Fri, 13 Jan 2017 16:14:01 +0100
-Subject: [PATCH 4/4] When using libtool, use LTLIBICONV instead.
-
-* This is required, as otherwise -Wl,--as-needed could fail.

- src/flac/Makefile.am | 2 +-
- src/metaflac/Makefile.am | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/flac/Makefile.am b/src/flac/Makefile.am
-index bf3bf468..fe6fa489 100644
 a/src/flac/Makefile.am
-+++ b/src/flac/Makefile.am
-@@ -60,7 +60,7 @@ flac_LDADD = \
-   
$(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \
-   $(top_builddir)/src/libFLAC/libFLAC.la \
-   $(win_utf8_lib) \
--  @LIBICONV@ \
-+  @LTLIBICONV@ \
-   -lm
- 
- CLEANFILES = flac.exe
-diff --git a/src/metaflac/Makefile.am b/src/metaflac/Makefile.am
-index 7a4ec6b6..ec201ddf 100644
 a/src/metaflac/Makefile.am
-+++ b/src/metaflac/Makefile.am
-@@ -55,6 +55,6 @@ metaflac_LDADD = \
-   $(top_builddir)/src/share/utf8/libutf8.la \
-   $(top_builddir)/src/libFLAC/libFLAC.la \
-   $(win_utf8_lib) \
--  @LIBICONV@
-+  @LTLIBICONV@
- 
- CLEANFILES = metaflac.exe
--- 
-2.11.0
-

diff --git a/media-libs/flac/files/flac-1.3.2-cflags.patch 
b/media-libs/flac/files/flac-1.3.2-cflags.patch
deleted file mode 100644
index

[gentoo-commits] repo/gentoo:master commit in: media-libs/flac/files/, media-libs/flac/

2017-01-13 Thread David Seifert

commit: 29397cdf2756c3fc6db869cd0e7e3db59536e9c5
Author: David Seifert  gentoo  org>
AuthorDate: Fri Jan 13 18:35:16 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Jan 13 18:35:52 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29397cdf

media-libs/flac: Make debugging info dependent on USE="debug"

Gentoo-bug: 604718

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-libs/flac/files/flac-1.3.2-asneeded.patch|  30 +-
 media-libs/flac/files/flac-1.3.2-cflags.patch  | 394 -
 .../flac/files/flac-1.3.2-dontbuild-examples.patch |  50 ++-
 .../flac/files/flac-1.3.2-fortify-sources.patch|  15 +
 .../flac/files/flac-1.3.2-honor-htmldir.patch  |  68 ++--
 .../{flac-1.3.2.ebuild => flac-1.3.2-r1.ebuild}|  17 +-
 6 files changed, 508 insertions(+), 66 deletions(-)

diff --git a/media-libs/flac/files/flac-1.3.2-asneeded.patch 
b/media-libs/flac/files/flac-1.3.2-asneeded.patch
index e4a4af7..f506f24 100644
--- a/media-libs/flac/files/flac-1.3.2-asneeded.patch
+++ b/media-libs/flac/files/flac-1.3.2-asneeded.patch
@@ -1,6 +1,19 @@
 flac-1.3.2/src/flac/Makefile.am
-+++ flac-1.3.2/src/flac/Makefile.am
-@@ -60,7 +60,7 @@
+From 8606b0f418c08aaba7f2565b005f9c00f8681ca1 Mon Sep 17 00:00:00 2001
+From: David Seifert 
+Date: Fri, 13 Jan 2017 16:14:01 +0100
+Subject: [PATCH 4/4] When using libtool, use LTLIBICONV instead.
+
+* This is required, as otherwise -Wl,--as-needed could fail.
+---
+ src/flac/Makefile.am | 2 +-
+ src/metaflac/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/flac/Makefile.am b/src/flac/Makefile.am
+index bf3bf468..fe6fa489 100644
+--- a/src/flac/Makefile.am
 b/src/flac/Makefile.am
+@@ -60,7 +60,7 @@ flac_LDADD = \

$(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \
$(top_builddir)/src/libFLAC/libFLAC.la \
$(win_utf8_lib) \
@@ -9,9 +22,11 @@
-lm
  
  CLEANFILES = flac.exe
 flac-1.3.2/src/metaflac/Makefile.am
-+++ flac-1.3.2/src/metaflac/Makefile.am
-@@ -55,6 +55,6 @@
+diff --git a/src/metaflac/Makefile.am b/src/metaflac/Makefile.am
+index 7a4ec6b6..ec201ddf 100644
+--- a/src/metaflac/Makefile.am
 b/src/metaflac/Makefile.am
+@@ -55,6 +55,6 @@ metaflac_LDADD = \
$(top_builddir)/src/share/utf8/libutf8.la \
$(top_builddir)/src/libFLAC/libFLAC.la \
$(win_utf8_lib) \
@@ -19,3 +34,6 @@
 +  @LTLIBICONV@
  
  CLEANFILES = metaflac.exe
+-- 
+2.11.0
+

diff --git a/media-libs/flac/files/flac-1.3.2-cflags.patch 
b/media-libs/flac/files/flac-1.3.2-cflags.patch
index fd1334d..e4159a4 100644
--- a/media-libs/flac/files/flac-1.3.2-cflags.patch
+++ b/media-libs/flac/files/flac-1.3.2-cflags.patch
@@ -1,6 +1,48 @@
 flac-1.3.2/configure.ac
-+++ flac-1.3.2/configure.ac
-@@ -384,14 +384,7 @@
+From eab60f424ae4810a8b3b07cf2d429be2905c9655 Mon Sep 17 00:00:00 2001
+From: David Seifert 
+Date: Fri, 13 Jan 2017 16:03:47 +0100
+Subject: [PATCH 1/4] Do not override CFLAGS, as CFLAGS is a user flag.
+
+* Furthermore, use NDEBUG globally to detect the presence
+  of building with more debug output information.
+  AX_CHECK_ENABLE_DEBUG is easier to use, and nowadays
+  Gnome has also switched to it from its own custom solution.
+---
+ configure.ac  |  19 +--
+ include/FLAC/assert.h |   2 +-
+ m4/ax_check_enable_debug.m4   | 124 ++
+ src/libFLAC/cpu.c |   2 +-
+ src/libFLAC/lpc.c |   4 +-
+ src/libFLAC/stream_encoder.c  |  10 ++--
+ src/plugin_common/Makefile.am |   6 --
+ src/plugin_common/charset.c   |   4 +-
+ src/plugin_xmms/http.c|  12 ++--
+ src/share/Makefile.am |   6 --
+ 10 files changed, 142 insertions(+), 47 deletions(-)
+ create mode 100644 m4/ax_check_enable_debug.m4
+
+diff --git a/configure.ac b/configure.ac
+index 235d2717..ba97bac0 100644
+--- a/configure.ac
 b/configure.ac
+@@ -205,14 +205,8 @@ AC_DEFINE(FLAC__ALIGN_MALLOC_DATA)
+ AH_TEMPLATE(FLAC__ALIGN_MALLOC_DATA, [define to align allocated memory on 
32-byte boundaries])
+ fi
+ 
+-AC_ARG_ENABLE(debug,
+-AC_HELP_STRING([--enable-debug], [Turn on debugging]),
+-[case "${enableval}" in
+-  yes) debug=true ;;
+-  no)  debug=false ;;
+-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
+-esac],[debug=false])
+-AM_CONDITIONAL(DEBUG, test "x$debug" = xtrue)
++AX_CHECK_ENABLE_DEBUG
++AM_CONDITIONAL([DEBUG], [test "x$ax_enable_debug" = "xyes" -o 
"x$ax_enable_debug" = "xinfo"])
+ 
+ AC_ARG_ENABLE(sse,
+ AC_HELP_STRING([--disable-sse], [Disable passing of -msse2 to the compiler]),
+@@ -384,15 +378,6 @@ AC_DEFINE(FLAC__HAS_NASM)
  AH_TEMPLATE(FLAC__HAS_NASM, [define if you are compiling for x86 and have the 
NASM assembler])
  fi
  
@@ -12,15 +54,345 @@
 -  CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//')
 -  CFLAGS="-O3 -funroll-loops $CFLAGS"
 -fi

[gentoo-commits] repo/gentoo:master commit in: media-libs/flac/files/, media-libs/flac/

2017-01-08 Thread David Seifert

commit: f0fca6b743c48593fc7fe4a4a8b2bba21739fe69
Author: David Seifert  gentoo  org>
AuthorDate: Sun Jan  8 21:27:19 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Jan  8 21:27:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0fca6b7

media-libs/flac: Call einstalldocs and minor fixups

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../flac/files/flac-1.3.2-honor-htmldir.patch  | 55 ++
 media-libs/flac/flac-1.3.2.ebuild  |  9 ++--
 2 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/media-libs/flac/files/flac-1.3.2-honor-htmldir.patch 
b/media-libs/flac/files/flac-1.3.2-honor-htmldir.patch
new file mode 100644
index ..2f93a67
--- /dev/null
+++ b/media-libs/flac/files/flac-1.3.2-honor-htmldir.patch
@@ -0,0 +1,55 @@
+HTML files should be installed to $(htmldir), and $(docdir) should
+not be changed, as this is a user flag in the GNU conventions.
+
+--- a/doc/html/images/Makefile.am
 b/doc/html/images/Makefile.am
+@@ -16,9 +16,9 @@
+ #  restrictive of those mentioned above.  See the file COPYING.Xiph in this
+ #  distribution.
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html/images
++logosdir = $(htmldir)/images
+ 
+-doc_DATA = \
++logos_DATA = \
+   logo.svg \
+   logo130.gif
+ 
+--- a/doc/html/Makefile.am
 b/doc/html/Makefile.am
+@@ -18,9 +18,7 @@
+ 
+ SUBDIRS = images
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html
+-
+-doc_DATA = \
++html_DATA = \
+   changelog.html \
+   developers.html \
+   documentation.html \
+@@ -46,10 +44,10 @@
+ # The install targets don't copy whole directories so we have to
+ # handle 'api/' specially:
+ install-data-local:
+-  $(mkinstalldirs) $(DESTDIR)$(docdir)/api
+-  (cd $(builddir)/api && $(INSTALL_DATA) * $(DESTDIR)$(docdir)/api)
++  $(mkinstalldirs) $(DESTDIR)$(htmldir)/api
++  (cd $(builddir)/api && $(INSTALL_DATA) * $(DESTDIR)$(htmldir)/api)
+ uninstall-local:
+-  rm -rf $(DESTDIR)$(docdir)/api
++  rm -rf $(DESTDIR)$(htmldir)/api
+ distclean-local:
+   -rm -rf api
+ endif
+--- a/doc/Makefile.am
 b/doc/Makefile.am
+@@ -31,8 +31,6 @@
+   mkdir -p html/api
+ endif
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+-
+ doc_DATA = \
+   FLAC.tag
+ 

diff --git a/media-libs/flac/flac-1.3.2.ebuild 
b/media-libs/flac/flac-1.3.2.ebuild
index 5b5d6bf..5786d31 100644
--- a/media-libs/flac/flac-1.3.2.ebuild
+++ b/media-libs/flac/flac-1.3.2.ebuild
@@ -28,16 +28,15 @@ src_prepare() {
"${FILESDIR}"/${PN}-1.3.2-asneeded.patch
"${FILESDIR}"/${PN}-1.3.0-dontbuild-tests.patch
"${FILESDIR}"/${PN}-1.3.2-dontbuild-examples.patch
+   "${FILESDIR}"/${PN}-1.3.2-honor-htmldir.patch
)
 
default
-
eautoreconf
 }
 
 multilib_src_configure() {
local myeconfargs=(
-   --docdir="${EPREFIX}"/usr/share/doc/${PF}/html
--disable-doxygen-docs
--disable-examples
--disable-xmms-plugin
@@ -47,6 +46,7 @@ multilib_src_configure() {
$(use_enable cxx cpplibs)
$(use_enable debug)
$(use_enable ogg)
+   $(use_enable static-libs static)
 
# cross-compile fix (bug #521446)
# no effect if ogg support is disabled
@@ -64,7 +64,6 @@ multilib_src_test() {
 }
 
 multilib_src_install_all() {
-   if ! use static-libs ; then
-   find "${ED}" \( -name "*.la" -o -name "*.a" \) -delete || die
-   fi
+   einstalldocs
+   find "${D}" -name '*.la' -delete || die
 }

[gentoo-commits] repo/gentoo:master commit in: media-libs/flac/files/, media-libs/flac/

2016-08-10 Thread Mike Frysinger

commit: c67d1548f656171b8586d2a54559508a360aee89
Author: Mike Frysinger  gentoo  org>
AuthorDate: Wed Aug 10 06:19:32 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Wed Aug 10 06:19:38 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c67d1548

media-libs/flac: add upstream fix for x32 builds #574984

 media-libs/flac/files/flac-1.3.1-x32.patch | 69 ++
 media-libs/flac/flac-1.3.1-r1.ebuild   |  1 +
 2 files changed, 70 insertions(+)

diff --git a/media-libs/flac/files/flac-1.3.1-x32.patch 
b/media-libs/flac/files/flac-1.3.1-x32.patch
new file mode 100644
index 000..2dc2d3b
--- /dev/null
+++ b/media-libs/flac/files/flac-1.3.1-x32.patch
@@ -0,0 +1,69 @@
+https://bugs.gentoo.org/574984
+
+fix from upstream
+
+From 7566d3d4c11c16801e1c98093c4db33589451c17 Mon Sep 17 00:00:00 2001
+From: Erik de Castro Lopo 
+Date: Wed, 11 Mar 2015 20:51:42 +1100
+Subject: [PATCH] configure.ac : Tweak for x32 architecture.
+
+The x32 architecture uses and ILP32 (32 bit ints, longs and pointers)
+on an x86_64 CPU. Since the CPU is x86_64 we need to set FLAC__CPU_X86_64
+even though the pointer size is 32 bits.
+
+Patch-from: Stuart Shelton
+Closes: https://sourceforge.net/p/flac/bugs/427/
+---
+ configure.ac | 37 -
+ 1 file changed, 24 insertions(+), 13 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3b1c037e80f5..2dcc6987a03d 100644
+--- a/configure.ac
 b/configure.ac
+@@ -105,19 +105,30 @@ AC_CHECK_SIZEOF(void*,1)
+ asm_optimisation=no
+ case "$host_cpu" in
+   x86_64)
+-  if test $ac_cv_sizeof_voidp = 4 ; then
+-  # This must be a 32 bit user space running on 64 bit 
kernel so treat
+-  # this as ia32.
+-  cpu_ia32=true
+-  AC_DEFINE(FLAC__CPU_IA32)
+-  AH_TEMPLATE(FLAC__CPU_IA32, [define if building for 
ia32/i386])
+-  else
+-  # x86_64 user space and kernel.
+-  cpu_x86_64=true
+-  AC_DEFINE(FLAC__CPU_X86_64)
+-  AH_TEMPLATE(FLAC__CPU_X86_64, [define if building for 
x86_64])
+-  fi
+-  asm_optimisation=$asm_opt
++  case "$host" in
++  *gnux32)
++  # x32 user space and 64 bit kernel.
++  cpu_x86_64=true
++  AC_DEFINE(FLAC__CPU_X86_64)
++  AH_TEMPLATE(FLAC__CPU_X86_64, [define if 
building for x86_64])
++  asm_optimisation=$asm_opt
++  ;;
++  *)
++  if test $ac_cv_sizeof_voidp = 4 ; then
++  # This must be a 32 bit user space 
running on 64 bit kernel so treat
++  # this as ia32.
++  cpu_ia32=true
++  AC_DEFINE(FLAC__CPU_IA32)
++  AH_TEMPLATE(FLAC__CPU_IA32, [define if 
building for ia32/i386])
++  else
++  # x86_64 user space and kernel.
++  cpu_x86_64=true
++  AC_DEFINE(FLAC__CPU_X86_64)
++  AH_TEMPLATE(FLAC__CPU_X86_64, [define 
if building for x86_64])
++  fi
++  asm_optimisation=$asm_opt
++  ;;
++  esac
+   ;;
+   i*86)
+   cpu_ia32=true
+-- 
+2.9.0

diff --git a/media-libs/flac/flac-1.3.1-r1.ebuild 
b/media-libs/flac/flac-1.3.1-r1.ebuild
index 79112a3..5d2f372 100644
--- a/media-libs/flac/flac-1.3.1-r1.ebuild
+++ b/media-libs/flac/flac-1.3.1-r1.ebuild
@@ -34,6 +34,7 @@ src_prepare() {
"${FILESDIR}"/${PN}-1.3.0-asneeded.patch
"${FILESDIR}"/${PN}-1.3.0-dontbuild-tests.patch
"${FILESDIR}"/${PN}-1.3.0-dontbuild-examples.patch
+   "${FILESDIR}"/${PN}-1.3.1-x32.patch #574984
)
 
AT_M4DIR="m4" autotools-multilib_src_prepare

[gentoo-commits] repo/gentoo:master commit in: media-libs/flac/files/, media-libs/flac/

[gentoo-commits] repo/gentoo:master commit in: media-libs/flac/files/, media-libs/flac/

[gentoo-commits] repo/gentoo:master commit in: media-libs/flac/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/flac/files/, media-libs/flac/

[gentoo-commits] repo/gentoo:master commit in: media-libs/flac/files/, media-libs/flac/

[gentoo-commits] repo/gentoo:master commit in: media-libs/flac/files/, media-libs/flac/

6 matches

Site Navigation

Mail list logo

Footer information