From 3ef0bd5b26b0a6e60044bace284ebeb78a6ebda8 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 00:51:04 +0000 Subject: [PATCH 1/4] Initialize branch F-13 for alleggl --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 55e783a08f92450a6473cad93633517abe44e4fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:42:30 +0000 Subject: [PATCH 2/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 2b97444..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: alleggl -# $Id$ -NAME := alleggl -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 From b45e59fb47a47d9fe4b5490ab34de6229548e184 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 10 Sep 2010 09:29:50 +0200 Subject: [PATCH 3/4] - Fix FTBFS (#631146) --- alleggl-0.4.3-make.patch | 99 ++++++++++++++++++++++++++++++++++++++++ alleggl.spec | 7 ++- 2 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 alleggl-0.4.3-make.patch diff --git a/alleggl-0.4.3-make.patch b/alleggl-0.4.3-make.patch new file mode 100644 index 0000000..9bbe8d8 --- /dev/null +++ b/alleggl-0.4.3-make.patch @@ -0,0 +1,99 @@ +diff -up alleggl/make/makefile.all~ alleggl/make/makefile.all +--- alleggl/make/makefile.all~ 2007-01-06 21:39:09.000000000 +0100 ++++ alleggl/make/makefile.all 2010-09-10 09:14:33.192573997 +0200 +@@ -47,7 +47,6 @@ ifeq ($(DATA_INSTALLER),) + PROG_INSTALLER=cp + endif + +-install: $(LIB_PATH_U) $(HEADERS_U) $(EXT_HEADERS_U) + ifdef UNIX_TOOLS + define CP_INSTALL + $(foreach file, $(HEADERS_U), - $(DATA_INSTALLER) $(file) $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file)) +@@ -59,6 +58,31 @@ ifdef UNIX_TOOLS + $(foreach link, $(LIB_LINKS_U), - ln -sf $(notdir $(LIB_PATH_U)) $(subst $(LIB_DIR),$(COMPILER_LIB_DIR_U),$(link)) + ) + endef ++ define RM_UNINSTALL ++ $(foreach link, $(LIB_LINKS_U), - rm -f $(subst $(LIB_DIR),$(COMPILER_LIB_DIR_U),$(link)) ++ ) ++ $(foreach file, $(HEADERS_U), - rm -f $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file)) ++ ) ++ $(foreach file, $(EXT_HEADERS_U), - rm -f $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file)) ++ ) ++ endef ++else ++ define CP_INSTALL ++ $(foreach file, $(HEADERS_D), - copy /y $(file) $(subst include,$(COMPILER_INCLUDE_DIR_D),$(file)) ++ ) ++ $(foreach file, $(EXT_HEADERS_D), - copy /y $(file) $(subst include,$(COMPILER_INCLUDE_DIR_D),$(file)) ++ ) ++ endef ++ define RM_UNINSTALL ++ $(foreach file, $(notdir $(HEADERS_D)), - del $(COMPILER_INCLUDE_DIR_D)\$(file) ++ ) ++ $(foreach file, $(notdir $(EXT_HEADERS_D)), - del $(COMPILER_INCLUDE_DIR_D)\$(file) ++ ) ++ endef ++endif ++ ++install: $(LIB_PATH_U) $(HEADERS_U) $(EXT_HEADERS_U) ++ifdef UNIX_TOOLS + ifeq ($(wildcard $(COMPILER_INCLUDE_DIR_U)/allegrogl),) + mkdir -p $(COMPILER_INCLUDE_DIR_U)/allegrogl + endif +@@ -73,12 +97,6 @@ ifdef UNIX_TOOLS + - $(INSTALL_LINK) + - $(LDCONFIG) + else +- define CP_INSTALL +- $(foreach file, $(HEADERS_D), - copy /y $(file) $(subst include,$(COMPILER_INCLUDE_DIR_D),$(file)) +- ) +- $(foreach file, $(EXT_HEADERS_D), - copy /y $(file) $(subst include,$(COMPILER_INCLUDE_DIR_D),$(file)) +- ) +- endef + - mkdir $(COMPILER_INCLUDE_DIR_D)\allegrogl + - mkdir $(COMPILER_INCLUDE_DIR_D)\allegrogl\GLext + - $(CP_INSTALL) +@@ -89,25 +107,11 @@ endif + + uninstall: + ifdef UNIX_TOOLS +- define RM_UNINSTALL +- $(foreach link, $(LIB_LINKS_U), - rm -f $(subst $(LIB_DIR),$(COMPILER_LIB_DIR_U),$(link)) +- ) +- $(foreach file, $(HEADERS_U), - rm -f $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file)) +- ) +- $(foreach file, $(EXT_HEADERS_U), - rm -f $(subst include,$(COMPILER_INCLUDE_DIR_U),$(file)) +- ) +- endef + - rm -f $(COMPILER_LIB_DIR_U)/$(notdir $(LIB_PATH_U)) + - $(RM_UNINSTALL) + - rm -rf $(COMPILER_INCLUDE_DIR_U)/allegrogl/GLext + - rm -rf $(COMPILER_INCLUDE_DIR_U)/allegrogl + else +- define RM_UNINSTALL +- $(foreach file, $(notdir $(HEADERS_D)), - del $(COMPILER_INCLUDE_DIR_D)\$(file) +- ) +- $(foreach file, $(notdir $(EXT_HEADERS_D)), - del $(COMPILER_INCLUDE_DIR_D)\$(file) +- ) +- endef + - $(RM_UNINSTALL) + - rmdir /s /q $(COMPILER_INCLUDE_DIR_D)\allegrogl + - del $(COMPILER_LIB_DIR_D)\$(notdir $(LIB_PATH_U)) +diff -up alleggl/make/makefile.unx~ alleggl/make/makefile.unx +--- alleggl/make/makefile.unx~ 2007-11-10 20:33:06.000000000 +0100 ++++ alleggl/make/makefile.unx 2010-09-10 09:24:30.423574002 +0200 +@@ -149,11 +149,12 @@ distlist: + + include make/makefile.dep + +-$(LIB_PATH_U): $(GENERAL_LIB_OBJS) $(PLATFORM_OBJECT) + define MAKE_LINKS + $(foreach link, $(LIB_LINKS_U), - ln -sf $(notdir $(LIB_PATH_U)) $(link) + ) + endef ++ ++$(LIB_PATH_U): $(GENERAL_LIB_OBJS) $(PLATFORM_OBJECT) + $(LIB_BUILDER) $@ $^ + - $(MAKE_LINKS) + diff --git a/alleggl.spec b/alleggl.spec index f7f5b5d..7a70336 100644 --- a/alleggl.spec +++ b/alleggl.spec @@ -1,6 +1,6 @@ Name: alleggl Version: 0.4.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: OpenGL support library for Allegro Group: System Environment/Libraries License: zlib @@ -8,6 +8,7 @@ URL: http://allegrogl.sourceforge.net/ Source0: http://downloads.sourceforge.net/allegrogl/%{name}-%{version}.tar.bz2 Patch0: alleggl-0.4.2-gcc43.patch Patch1: alleggl-0.4.3-fullscreen-viewport.patch +Patch2: alleggl-0.4.3-make.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel libGLU-devel libX11-devel libXext-devel BuildRequires: libXpm-devel libXxf86vm-devel @@ -39,6 +40,7 @@ developing applications that use %{name}. %setup -q -n %{name} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build @@ -89,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Sep 10 2010 Hans de Goede 0.4.3-7 +- Fix FTBFS (#631146) + * Thu Sep 10 2009 Hans de Goede 0.4.3-6 - Fix (workaround) viewport issues in fullscreen mode (#522116) From f93adfd49fcabe15e334b252487dc32fe57a0a84 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 1 Dec 2010 08:53:45 +0100 Subject: [PATCH 4/4] - Fix crash when libGL reports a NULL rendering string (#658758) --- alleggl-0.4.3-rhbz658758.patch | 16 ++++++++++++++++ alleggl.spec | 7 ++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 alleggl-0.4.3-rhbz658758.patch diff --git a/alleggl-0.4.3-rhbz658758.patch b/alleggl-0.4.3-rhbz658758.patch new file mode 100644 index 0000000..6613829 --- /dev/null +++ b/alleggl-0.4.3-rhbz658758.patch @@ -0,0 +1,16 @@ +diff -up alleggl/src/glext.c~ alleggl/src/glext.c +--- alleggl/src/glext.c~ 2007-05-15 15:37:46.000000000 +0200 ++++ alleggl/src/glext.c 2010-12-01 08:51:23.631386748 +0100 +@@ -450,6 +450,12 @@ static void __fill_in_info_struct(const + struct allegro_gl_info *info) { + const char *renderer = (const char*)rendereru; + ++ /* The render string can be NULL ?? See: ++ https://bugzilla.redhat.com/show_bug.cgi?id=658758 */ ++ if (renderer == NULL) { ++ renderer = "foobar"; ++ } ++ + /* Some cards are "special"... */ + if (strstr(renderer, "3Dfx/Voodoo")) { + info->is_voodoo = 1; diff --git a/alleggl.spec b/alleggl.spec index 7a70336..a6fedd4 100644 --- a/alleggl.spec +++ b/alleggl.spec @@ -1,6 +1,6 @@ Name: alleggl Version: 0.4.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: OpenGL support library for Allegro Group: System Environment/Libraries License: zlib @@ -9,6 +9,7 @@ Source0: http://downloads.sourceforge.net/allegrogl/%{name}-%{version}.ta Patch0: alleggl-0.4.2-gcc43.patch Patch1: alleggl-0.4.3-fullscreen-viewport.patch Patch2: alleggl-0.4.3-make.patch +Patch3: alleggl-0.4.3-rhbz658758.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel libGLU-devel libX11-devel libXext-devel BuildRequires: libXpm-devel libXxf86vm-devel @@ -41,6 +42,7 @@ developing applications that use %{name}. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build @@ -91,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Dec 1 2010 Hans de Goede 0.4.3-8 +- Fix crash when libGL reports a NULL rendering string (#658758) + * Fri Sep 10 2010 Hans de Goede 0.4.3-7 - Fix FTBFS (#631146)