forked from pool/aegisub
Accepting request 135236 from multimedia:apps
- Add aegisub-2.1.9-no_glu.patch - Remove explicit glu dependency. wxWidgets-devel is the one that should have it - Remove explicit xfixes,xdamage and xxf86vm dependencies. Mesa-libGL-devel is the one that should be fixed (probably removing the .la file) - Add explicit glu,xfixes,xdagame and xxf86vm dependency OBS-URL: https://build.opensuse.org/request/show/135236 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aegisub?expand=0&rev=3
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
d6892b7a2b
153
aegisub-2.1.9-no_glu.patch
Normal file
153
aegisub-2.1.9-no_glu.patch
Normal file
@ -0,0 +1,153 @@
|
|||||||
|
Index: configure
|
||||||
|
===================================================================
|
||||||
|
--- configure.orig
|
||||||
|
+++ configure
|
||||||
|
@@ -20102,55 +20102,6 @@ See \`config.log' for more details." "$L
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
- aegisub_save_LIBS="$LIBS"
|
||||||
|
- aegisub_save_CPPFLAGS="$CPPFLAGS"
|
||||||
|
- CPPFLAGS="$GL_CFLAGS"
|
||||||
|
- LIBS="$GL_LIBS -lGLU"
|
||||||
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether OpenGLU works" >&5
|
||||||
|
-$as_echo_n "checking whether OpenGLU works... " >&6; }
|
||||||
|
-if test "${agi_cv_with_openglu+set}" = set; then :
|
||||||
|
- $as_echo_n "(cached) " >&6
|
||||||
|
-else
|
||||||
|
- if test "$cross_compiling" = yes; then :
|
||||||
|
- if test $? -ne 0; then
|
||||||
|
- eval agi_cv_with_openglu="no";
|
||||||
|
- else
|
||||||
|
- eval agi_cv_with_openglu="yes";
|
||||||
|
- fi
|
||||||
|
-else
|
||||||
|
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
|
-/* end confdefs.h. */
|
||||||
|
-
|
||||||
|
-#include <GL/glu.h>
|
||||||
|
-int main(void) {
|
||||||
|
- return 0;
|
||||||
|
-}
|
||||||
|
-_ACEOF
|
||||||
|
-if ac_fn_cxx_try_run "$LINENO"; then :
|
||||||
|
- eval agi_cv_with_openglu="yes"
|
||||||
|
-else
|
||||||
|
- eval agi_cv_with_openglu="no"
|
||||||
|
-fi
|
||||||
|
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
|
||||||
|
- conftest.$ac_objext conftest.beam conftest.$ac_ext
|
||||||
|
-fi
|
||||||
|
-
|
||||||
|
-
|
||||||
|
-fi
|
||||||
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $agi_cv_with_openglu" >&5
|
||||||
|
-$as_echo "$agi_cv_with_openglu" >&6; }
|
||||||
|
- CPPFLAGS="$aegisub_save_CPPFLAGS"
|
||||||
|
- LIBS="$aegisub_save_LIBS"
|
||||||
|
-
|
||||||
|
-
|
||||||
|
-if test "$agi_cv_with_openglu" = "no" && test "$build_darwin" != "yes"; then
|
||||||
|
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||||||
|
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||||
|
-as_fn_error "Please install a working OpenGL GLU library.
|
||||||
|
-See \`config.log' for more details." "$LINENO" 5; }
|
||||||
|
-fi
|
||||||
|
-
|
||||||
|
-
|
||||||
|
###########
|
||||||
|
## Freetype
|
||||||
|
###########
|
||||||
|
Index: configure.in
|
||||||
|
===================================================================
|
||||||
|
--- configure.in.orig
|
||||||
|
+++ configure.in
|
||||||
|
@@ -368,16 +368,6 @@ if test "$agi_cv_with_opengl" = "no"; th
|
||||||
|
AC_MSG_FAILURE([Please install a working OpenGL library.])
|
||||||
|
fi
|
||||||
|
|
||||||
|
-AC_AGI_COMPILE([OpenGLU], [openglu], [$GL_CFLAGS], [$GL_LIBS -lGLU],[
|
||||||
|
-#include <GL/glu.h>
|
||||||
|
-int main(void) {
|
||||||
|
- return 0;
|
||||||
|
-}])
|
||||||
|
-
|
||||||
|
-if test "$agi_cv_with_openglu" = "no" && test "$build_darwin" != "yes"; then
|
||||||
|
- AC_MSG_FAILURE([Please install a working OpenGL GLU library.])
|
||||||
|
-fi
|
||||||
|
-
|
||||||
|
|
||||||
|
###########
|
||||||
|
## Freetype
|
||||||
|
Index: src/gl_wrap.h
|
||||||
|
===================================================================
|
||||||
|
--- src/gl_wrap.h.orig
|
||||||
|
+++ src/gl_wrap.h
|
||||||
|
@@ -40,7 +40,6 @@
|
||||||
|
#include <OpenGL/glu.h>
|
||||||
|
#else
|
||||||
|
#include <GL/gl.h>
|
||||||
|
-#include <GL/glu.h>
|
||||||
|
typedef GLuint GLhandleARB;
|
||||||
|
#endif
|
||||||
|
#include <wx/thread.h>
|
||||||
|
Index: src/stdwx.h
|
||||||
|
===================================================================
|
||||||
|
--- src/stdwx.h.orig
|
||||||
|
+++ src/stdwx.h
|
||||||
|
@@ -232,7 +232,6 @@
|
||||||
|
#include <OpenGL/glu.h>
|
||||||
|
#else
|
||||||
|
#include <GL/gl.h>
|
||||||
|
-#include <GL/glu.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef _CRT_SECURE_NO_WARNINGS
|
||||||
|
Index: src/video_context.cpp
|
||||||
|
===================================================================
|
||||||
|
--- src/video_context.cpp.orig
|
||||||
|
+++ src/video_context.cpp
|
||||||
|
@@ -43,7 +43,6 @@
|
||||||
|
#include <OpenGL/glu.h>
|
||||||
|
#else
|
||||||
|
#include <GL/gl.h>
|
||||||
|
-#include <GL/glu.h>
|
||||||
|
#endif
|
||||||
|
#include <wx/image.h>
|
||||||
|
#include <string.h>
|
||||||
|
Index: src/video_context.h
|
||||||
|
===================================================================
|
||||||
|
--- src/video_context.h.orig
|
||||||
|
+++ src/video_context.h
|
||||||
|
@@ -53,7 +53,6 @@
|
||||||
|
#include <OpenGL/glu.h>
|
||||||
|
#else
|
||||||
|
#include <GL/gl.h>
|
||||||
|
-#include <GL/glu.h>
|
||||||
|
typedef GLuint GLhandleARB;
|
||||||
|
#endif
|
||||||
|
#include "video_frame.h"
|
||||||
|
Index: src/video_display.cpp
|
||||||
|
===================================================================
|
||||||
|
--- src/video_display.cpp.orig
|
||||||
|
+++ src/video_display.cpp
|
||||||
|
@@ -44,7 +44,6 @@
|
||||||
|
#include <OpenGL/glu.h>
|
||||||
|
#else
|
||||||
|
#include <GL/gl.h>
|
||||||
|
-#include <GL/glu.h>
|
||||||
|
#endif
|
||||||
|
#include <wx/image.h>
|
||||||
|
#include <string.h>
|
||||||
|
Index: src/video_out_gl.cpp
|
||||||
|
===================================================================
|
||||||
|
--- src/video_out_gl.cpp.orig
|
||||||
|
+++ src/video_out_gl.cpp
|
||||||
|
@@ -50,7 +50,6 @@ using std::max;
|
||||||
|
#include <OpenGL/glu.h>
|
||||||
|
#else
|
||||||
|
#include <GL/gl.h>
|
||||||
|
-#include <GL/glu.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "video_out_gl.h"
|
||||||
@ -1,3 +1,17 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Sep 21 10:20:14 UTC 2012 - reddwarf@opensuse.org
|
||||||
|
|
||||||
|
- Add aegisub-2.1.9-no_glu.patch
|
||||||
|
- Remove explicit glu dependency.
|
||||||
|
wxWidgets-devel is the one that should have it
|
||||||
|
- Remove explicit xfixes,xdamage and xxf86vm dependencies.
|
||||||
|
Mesa-libGL-devel is the one that should be fixed (probably removing the .la file)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Sep 21 08:27:11 UTC 2012 - idonmez@suse.com
|
||||||
|
|
||||||
|
- Add explicit glu,xfixes,xdagame and xxf86vm dependency
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Feb 10 16:19:57 UTC 2012 - reddwarf@opensuse.org
|
Fri Feb 10 16:19:57 UTC 2012 - reddwarf@opensuse.org
|
||||||
|
|
||||||
|
|||||||
@ -28,9 +28,14 @@ License: BSD-3-Clause
|
|||||||
Group: Productivity/Multimedia/Video/Editors and Convertors
|
Group: Productivity/Multimedia/Video/Editors and Convertors
|
||||||
Url: http://www.aegisub.net/
|
Url: http://www.aegisub.net/
|
||||||
Source0: http://ftp.aegisub.org/pub/releases/aegisub-%{version}.tar.gz
|
Source0: http://ftp.aegisub.org/pub/releases/aegisub-%{version}.tar.gz
|
||||||
|
# PATCH-FEATURE-OPENSUSE aegisub-2.1.9-system_libs.patch reddwarf@opensuse.org -- Use system libraries instead of included ones
|
||||||
Patch0: aegisub-2.1.9-system_libs.patch
|
Patch0: aegisub-2.1.9-system_libs.patch
|
||||||
|
# PATCH-FIX-UPSTREAM aegisub-2.1.8.99.rev5789-ld.patch reddwarf@opensuse.org -- Link against librt. Fixed upstream.
|
||||||
Patch1: aegisub-2.1.8.99.rev5789-ld.patch
|
Patch1: aegisub-2.1.8.99.rev5789-ld.patch
|
||||||
|
# PATCH-FIX-UPSTREAM aegisub-2.1.9-underlinking.patch reddwarf@opensuse.org -- Link against libz, Fixed upstream.
|
||||||
Patch2: aegisub-2.1.9-underlinking.patch
|
Patch2: aegisub-2.1.9-underlinking.patch
|
||||||
|
# PATCH-FIX-UPSTREAM aegisub-2.1.9-no_glu.patch http://devel.aegisub.org/ticket/1511 reddwarf@opensuse.org -- Don't ask for GLU since it's not being used
|
||||||
|
Patch3: aegisub-2.1.9-no_glu.patch
|
||||||
BuildRequires: ImageMagick
|
BuildRequires: ImageMagick
|
||||||
BuildRequires: boost-devel >= 1.34
|
BuildRequires: boost-devel >= 1.34
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
@ -75,6 +80,7 @@ functions with ease.
|
|||||||
%patch0
|
%patch0
|
||||||
%patch1
|
%patch1
|
||||||
%patch2
|
%patch2
|
||||||
|
%patch3
|
||||||
rm -r src/boost
|
rm -r src/boost
|
||||||
rm -r src/gl
|
rm -r src/gl
|
||||||
FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
|
FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user