From: "Aaron Bauman" <bman@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/gliv/files/
Date: Wed, 13 Jun 2018 21:18:23 +0000 (UTC) [thread overview]
Message-ID: <1528924530.ce56482121a5ef9aa2997488ee457c67e4570a20.bman@gentoo> (raw)
commit: ce56482121a5ef9aa2997488ee457c67e4570a20
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Jun 13 18:00:04 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Wed Jun 13 21:15:30 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce564821
media-gfx/gliv: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/8834
media-gfx/gliv/files/gliv-1.9.6-as-needed.patch | 99 -------------------------
1 file changed, 99 deletions(-)
diff --git a/media-gfx/gliv/files/gliv-1.9.6-as-needed.patch b/media-gfx/gliv/files/gliv-1.9.6-as-needed.patch
deleted file mode 100644
index 3128b99e443..00000000000
--- a/media-gfx/gliv/files/gliv-1.9.6-as-needed.patch
+++ /dev/null
@@ -1,99 +0,0 @@
---- gliv-1.9.6.orig/configure.ac 2005-09-21 23:05:57.000000000 +0200
-+++ gliv-1.9.6/configure.ac 2010-01-03 15:51:41.464539460 +0100
-@@ -16,18 +16,17 @@
- # Checks for programs.
- AC_PROG_CC
- AC_PROG_RANLIB
--
-+AC_USE_SYSTEM_EXTENSIONS
-
- # Default CFLAGS.
--if test "x$GCC" = "xyes" && test "$DEFAULT_CFLAGS" = "yes"; then
-- CFLAGS="-Wall -O2 -fomit-frame-pointer -ffast-math"
--fi
--CFLAGS="$CFLAGS -I${srcdir}/../lib"
-+#if test "x$GCC" = "xyes" && test "$DEFAULT_CFLAGS" = "yes"; then
-+# CFLAGS="-Wall -O2 -fomit-frame-pointer -ffast-math"
-+#fi
-+#CFLAGS="$CFLAGS -I${srcdir}/../lib"
-
- # Checks for LFS flags, we may not handle big files, but it doesn't hurt.
- AC_SYS_LARGEFILE
-
--
- AC_DEFUN([CHECK_MATH],
- [OLD_CFLAGS="$CFLAGS"]
- [CFLAGS="$CFLAGS -w"]
-@@ -127,35 +126,22 @@
-
- # Checks for X.
- AC_PATH_XTRA
--CFLAGS="$X_CFLAGS $CFLAGS"
--LDFLAGS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS $LDFLAGS"
-
- # Checks for GtkGLExt.
- PKG_CHECK_MODULES(GTKGLEXT, [gtkglext-1.0 >= 0.7.0])
--CFLAGS="$GTKGLEXT_CFLAGS $CFLAGS"
--LDFLAGS="$GTKGLEXT_LIBS $LDFLAGS"
- GTKGL_VERSION="$($PKG_CONFIG --modversion gtkglext-1.0)"
-
- # Checks for OpenGL.
--AC_TRY_LINK([#include "GL/gl.h"],
-- [glBegin(GL_QUADS);],
-- [ogl="yes"],
-- [ogl="no"])
--
-+AC_SEARCH_LIBS([glBegin],[GL],[ogl="yes"],[ogl="no"],)
- if test "x$ogl" = "xno"; then
- AC_MSG_NOTICE([maybe libGL requires libpthread...])
-- OLD_LDFLAGS="$LDFLAGS"
-- LDFLAGS="$LDFLAGS -lpthread"
-- AC_TRY_LINK([#include "GL/gl.h"],
-- [glBegin(GL_QUADS);],
-- [],
-- AC_MSG_ERROR([cannot use -lGL]))
-+ AC_SEARCH_LIBS([glBegin],[GL],[ogl="yes"],[ogl="no"],[-lpthread])
- fi
-
- # Checks for gtk.
- AM_PATH_GTK_2_0([2.6.0], [
- CFLAGS="$GTK_CFLAGS $CFLAGS"
-- LDFLAGS="$GTK_LIBS $LDFLAGS"
-+ LIBS="$LIBS $GTK_LIBS"
- GTK_VERSION="$($PKG_CONFIG --modversion gtk+-2.0)"
- ], [exit 1], [gthread])
-
-@@ -163,9 +149,6 @@
- ALL_LINGUAS=$(echo po/*.po | sed -e 's|\.po||g' -e 's|po/||g')
- AM_GNU_GETTEXT_VERSION
- AM_GNU_GETTEXT
--CFLAGS="$CFLAGS -I../${srcdir}/intl"
--LIBS="$LIBS $LIBINTL"
--
-
- AC_CONFIG_FILES([
- Makefile
---- gliv-1.9.6.orig/src/Makefile.am 2006-11-18 15:21:13.000000000 +0100
-+++ gliv-1.9.6/src/Makefile.am 2010-01-03 15:48:45.765539472 +0100
-@@ -64,6 +64,9 @@
- gliv_LDADD = -L../lib -lreplacements
- endif
-
-+gliv_CFLAGS = @GTKGLEXT_CFLAGS@
-+gliv_LDADD = @GTKGLEXT_LIBS@
-+
- AM_CPPFLAGS = -I$(srcdir)/include -D_REENTRANT -D_THREAD_SAFE \
- -DSYSCONFDIR=\"$(sysconfdir)\"
-
---- gliv-1.9.6.orig/po/Makefile.in.in 2006-11-18 15:21:13.000000000 +0100
-+++ gliv-1.9.6/po/Makefile.in.in 2010-01-03 16:05:43.860539403 +0100
-@@ -29,7 +29,7 @@
-
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
--MKINSTALLDIRS = @MKINSTALLDIRS@
-+MKINSTALLDIRS = $(top_srcdir)/mkinstalldirs
- mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
-
- GMSGFMT = @GMSGFMT@
-
reply other threads:[~2018-06-13 21:18 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1528924530.ce56482121a5ef9aa2997488ee457c67e4570a20.bman@gentoo \
--to=bman@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox