From f8cf897494c165d0437b50ebbfe84936c9d8ad26 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Jul 12 2011 22:26:21 +0000
Subject: New upstream release

Partially based on spec file update by Brandon McCaig <bamccaig@gmail.com>
Drop a number of no longer relevant patches
Now comes with alleggl, jpgalleg, loadpng and logg bundled

---

diff --git a/.gitignore b/.gitignore
index 69b28e7..04aa4be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 allegro-4.2.3.tar.gz
+/allegro-4.4.2.tar.gz
diff --git a/allegro-4.0.3-libdir.patch b/allegro-4.0.3-libdir.patch
index 051555f..f9b7983 100644
--- a/allegro-4.0.3-libdir.patch
+++ b/allegro-4.0.3-libdir.patch
@@ -1,12 +1,12 @@
-diff -up allegro-4.2.2/misc/allegro-config.in.multilib2 allegro-4.2.2/misc/allegro-config.in
---- allegro-4.2.2/misc/allegro-config.in.multilib2	2007-07-22 09:45:47.000000000 +0200
-+++ allegro-4.2.2/misc/allegro-config.in	2007-07-24 21:27:21.000000000 +0200
-@@ -16,15 +16,22 @@ exec_prefix=$prefix
+diff -up allegro-4.4.2/misc/allegro-config.in~ allegro-4.4.2/misc/allegro-config.in
+--- allegro-4.4.2/misc/allegro-config.in~	2010-03-03 11:22:34.000000000 +0100
++++ allegro-4.4.2/misc/allegro-config.in	2011-07-12 10:42:05.231457514 +0200
+@@ -19,8 +19,15 @@ exec_prefix=$prefix
  exec_prefix_set=no
  include_prefix=@INCLUDE_PREFIX@
- include_path=@includedir@
--lib_path=@libdir@
- bin_path=@bindir@
+ include_path=${prefix}/include
+-lib_path=${exec_prefix}/lib@LIB_SUFFIX@
+ bin_path=${exec_prefix}/bin
 +arch=$(/bin/arch)
 +if [ "$arch" = "x86_64" -o "$arch" = "s390x" -o "$arch" = "ppc64" \
 +    -o "$arch" = "ia64" ];
@@ -18,11 +18,3 @@ diff -up allegro-4.2.2/misc/allegro-config.in.multilib2 allegro-4.2.2/misc/alleg
  
  static_libs=@LINK_WITH_STATIC_LIBS@
  lib_type=@LIB_TO_LINK@
- 
- accepts_frameworks=no
- 
--allegro_ldflags="@LDFLAGS@"
-+allegro_ldflags="-Wl,--export-dynamic "
- allegro_libs="@LIBS@"
- allegro_frameworks="@FRAMEWORKS@"
- allegro_cflags=""
diff --git a/allegro-4.2.0-multilib.patch b/allegro-4.2.0-multilib.patch
deleted file mode 100644
index 81400ed..0000000
--- a/allegro-4.2.0-multilib.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- allegro-4.2.2/include/allegro/platform/alunixac.hin.multilib	2007-07-15 06:28:15.000000000 +0200
-+++ allegro-4.2.2/include/allegro/platform/alunixac.hin	2007-07-23 12:36:16.000000000 +0200
-@@ -59,10 +59,14 @@
- #undef ALLEGRO_ASM_PREFIX
- 
- /* Define if assembler supports MMX. */
--#undef ALLEGRO_MMX
-+#ifdef __i386__
-+#define ALLEGRO_MMX 1
-+#endif
- 
- /* Define if assembler supports SSE. */
--#undef ALLEGRO_SSE
-+#ifdef __i386__
-+#define ALLEGRO_SSE 1
-+#endif
- 
- /* Define if target platform is Darwin. */
- #undef ALLEGRO_DARWIN
-@@ -120,7 +124,9 @@
- #undef ALLEGRO_LINUX_VBEAF
- 
- /* Define to enable Linux console VGA driver. */
--#undef ALLEGRO_LINUX_VGA
-+#ifdef __i386__
-+#define ALLEGRO_LINUX_VGA 1
-+#endif
- 
- /*---------------------------------------------------------------------------*/
- 
diff --git a/allegro-4.2.0-noexecstack.patch b/allegro-4.2.0-noexecstack.patch
deleted file mode 100644
index 578687d..0000000
--- a/allegro-4.2.0-noexecstack.patch
+++ /dev/null
@@ -1,233 +0,0 @@
---- allegro-4.2.0/src/x/xdga2s.s.noexecstack	2004-08-27 15:54:05.000000000 +0200
-+++ allegro-4.2.0/src/x/xdga2s.s	2006-07-06 17:22:04.000000000 +0200
-@@ -50,4 +50,5 @@
- 
- #endif
- #endif
-+.section .note.GNU-stack,"",@progbits
- 
---- allegro-4.2.0/src/x/xwins.s.noexecstack	2004-09-03 11:30:45.000000000 +0200
-+++ allegro-4.2.0/src/x/xwins.s	2006-07-06 17:22:04.000000000 +0200
-@@ -49,5 +49,6 @@
- 	popl %ecx
- 	ret
- 
-+.section .note.GNU-stack,"",@progbits
- #endif
- 
---- allegro-4.2.0/src/i386/iblit16.s.noexecstack	2005-06-22 18:51:16.000000000 +0200
-+++ allegro-4.2.0/src/i386/iblit16.s	2006-07-06 17:22:04.000000000 +0200
-@@ -741,5 +741,5 @@
- 
- 
- 
--
-+.section .note.GNU-stack,"",@progbits
- #endif      /* ifdef ALLEGRO_COLOR16 */
---- allegro-4.2.0/src/i386/iblit24.s.noexecstack	2005-06-22 18:51:16.000000000 +0200
-+++ allegro-4.2.0/src/i386/iblit24.s	2006-07-06 17:22:04.000000000 +0200
-@@ -370,5 +370,5 @@
- 
- 
- 
--
-+.section .note.GNU-stack,"",@progbits
- #endif      /* ifdef ALLEGRO_COLOR24 */
---- allegro-4.2.0/src/i386/iblit32.s.noexecstack	2005-06-22 18:51:16.000000000 +0200
-+++ allegro-4.2.0/src/i386/iblit32.s	2006-07-06 17:22:04.000000000 +0200
-@@ -355,5 +355,5 @@
- 
- 
- 
--
-+.section .note.GNU-stack,"",@progbits
- #endif      /* ifdef ALLEGRO_COLOR32 */
---- allegro-4.2.0/src/i386/iblit8.s.noexecstack	2005-06-22 18:51:16.000000000 +0200
-+++ allegro-4.2.0/src/i386/iblit8.s	2006-07-06 17:22:04.000000000 +0200
-@@ -785,5 +785,5 @@
- 
- 
- 
--
-+.section .note.GNU-stack,"",@progbits
- #endif      /* ifdef ALLEGRO_COLOR8 */
---- allegro-4.2.0/src/i386/icpus.s.noexecstack	2005-03-10 19:28:16.000000000 +0100
-+++ allegro-4.2.0/src/i386/icpus.s	2006-07-06 17:22:04.000000000 +0200
-@@ -213,3 +213,4 @@
-    popl %ebp
-    ret
- 
-+.section .note.GNU-stack,"",@progbits
---- allegro-4.2.0/src/i386/igfx15.s.noexecstack	2000-05-14 22:17:13.000000000 +0200
-+++ allegro-4.2.0/src/i386/igfx15.s	2006-07-06 17:22:04.000000000 +0200
-@@ -433,6 +433,6 @@
- 
- 
- 
--
-+.section .note.GNU-stack,"",@progbits
- #endif      /* ifdef ALLEGRO_COLOR16 */
- 
---- allegro-4.2.0/src/i386/igfx16.s.noexecstack	2000-05-14 22:17:11.000000000 +0200
-+++ allegro-4.2.0/src/i386/igfx16.s	2006-07-06 17:22:04.000000000 +0200
-@@ -484,6 +484,6 @@
- 
- 
- 
--
-+.section .note.GNU-stack,"",@progbits
- #endif      /* ifdef ALLEGRO_COLOR16 */
- 
---- allegro-4.2.0/src/i386/igfx24.s.noexecstack	2000-05-14 22:17:13.000000000 +0200
-+++ allegro-4.2.0/src/i386/igfx24.s	2006-07-06 17:22:04.000000000 +0200
-@@ -578,6 +578,6 @@
- 
- 
- 
--
-+.section .note.GNU-stack,"",@progbits
- #endif      /* ifdef ALLEGRO_COLOR24 */
- 
---- allegro-4.2.0/src/i386/igfx32.s.noexecstack	2000-05-14 22:17:11.000000000 +0200
-+++ allegro-4.2.0/src/i386/igfx32.s	2006-07-06 17:22:04.000000000 +0200
-@@ -464,6 +464,6 @@
- 
- 
- 
--
-+.section .note.GNU-stack,"",@progbits
- #endif      /* ifdef ALLEGRO_COLOR32 */
- 
---- allegro-4.2.0/src/i386/igfx8.s.noexecstack	2001-04-09 06:49:29.000000000 +0200
-+++ allegro-4.2.0/src/i386/igfx8.s	2006-07-06 17:22:04.000000000 +0200
-@@ -527,6 +527,6 @@
- 
- 
- 
--
-+.section .note.GNU-stack,"",@progbits
- #endif      /* ifdef ALLEGRO_COLOR8 */
- 
---- allegro-4.2.0/src/i386/imisc.s.noexecstack	2002-07-05 12:23:47.000000000 +0200
-+++ allegro-4.2.0/src/i386/imisc.s	2006-07-06 17:22:04.000000000 +0200
-@@ -600,3 +600,4 @@
-    popl %ebp
-    ret                           /* end of fixhypot() */
- 
-+.section .note.GNU-stack,"",@progbits
---- allegro-4.2.0/src/i386/iscan.s.noexecstack	2004-09-06 18:06:53.000000000 +0200
-+++ allegro-4.2.0/src/i386/iscan.s	2006-07-06 17:22:04.000000000 +0200
-@@ -2777,3 +2777,5 @@
-    ret                           /* end of _poly_scanline_ptex_mask_trans24() */
- 
- #endif /* COLOR24 */
-+
-+.section .note.GNU-stack,"",@progbits
---- allegro-4.2.0/src/i386/iscanmmx.s.noexecstack	2003-07-16 21:43:28.000000000 +0200
-+++ allegro-4.2.0/src/i386/iscanmmx.s	2006-07-06 17:22:04.000000000 +0200
-@@ -1670,5 +1670,5 @@
- 
- #endif /* COLOR24 */
- 
--
-+.section .note.GNU-stack,"",@progbits
- #endif /* MMX */
---- allegro-4.2.0/src/i386/ispr15.s.noexecstack	2001-11-10 20:31:50.000000000 +0100
-+++ allegro-4.2.0/src/i386/ispr15.s	2006-07-06 17:22:04.000000000 +0200
-@@ -491,6 +491,6 @@
- 
- 
- 
--
-+.section .note.GNU-stack,"",@progbits
- #endif      /* ifdef ALLEGRO_COLOR16 */
- 
---- allegro-4.2.0/src/i386/ispr16.s.noexecstack	2002-10-02 20:29:57.000000000 +0200
-+++ allegro-4.2.0/src/i386/ispr16.s	2006-07-06 17:22:04.000000000 +0200
-@@ -886,6 +886,6 @@
- 
- 
- 
--
-+.section .note.GNU-stack,"",@progbits
- #endif      /* ifdef ALLEGRO_COLOR16 */
- 
---- allegro-4.2.0/src/i386/ispr24.s.noexecstack	2002-10-02 20:29:57.000000000 +0200
-+++ allegro-4.2.0/src/i386/ispr24.s	2006-07-06 17:22:04.000000000 +0200
-@@ -910,6 +910,6 @@
- 
- 
- 
--
-+.section .note.GNU-stack,"",@progbits
- #endif      /* ifdef ALLEGRO_COLOR24 */
- 
---- allegro-4.2.0/src/i386/ispr32.s.noexecstack	2002-10-02 20:29:57.000000000 +0200
-+++ allegro-4.2.0/src/i386/ispr32.s	2006-07-06 17:22:04.000000000 +0200
-@@ -697,6 +697,6 @@
- 
- 
- 
--
-+.section .note.GNU-stack,"",@progbits
- #endif      /* ifdef ALLEGRO_COLOR32 */
- 
---- allegro-4.2.0/src/i386/ispr8.s.noexecstack	2004-10-16 21:44:25.000000000 +0200
-+++ allegro-4.2.0/src/i386/ispr8.s	2006-07-06 17:22:04.000000000 +0200
-@@ -1044,5 +1044,5 @@
- 
- 
- 
--
-+.section .note.GNU-stack,"",@progbits
- #endif      /* ifdef ALLEGRO_COLOR8 */
---- allegro-4.2.0/src/i386/izbuf.s.noexecstack	2004-04-08 21:26:20.000000000 +0200
-+++ allegro-4.2.0/src/i386/izbuf.s	2006-07-06 17:22:04.000000000 +0200
-@@ -2328,3 +2328,5 @@
-    ret                           /* end of _poly_zbuf_ptex_mask_trans24() */
- 
- #endif /* COLOR24 */
-+
-+.section .note.GNU-stack,"",@progbits
---- allegro-4.2.0/src/misc/icolconv.s.noexecstack	2006-07-06 17:32:28.000000000 +0200
-+++ allegro-4.2.0/src/misc/icolconv.s	2006-07-06 17:34:31.000000000 +0200
-@@ -3288,3 +3288,4 @@
- 
- #endif  /* ALLEGRO_NO_COLORCOPY */
- 
-+.section .note.GNU-stack,"",@progbits
---- allegro-4.2.0/src/amd64/acpus.s.noexecstack	2005-03-07 11:24:38.000000000 +0100
-+++ allegro-4.2.0/src/amd64/acpus.s	2006-07-06 17:22:04.000000000 +0200
-@@ -128,3 +128,4 @@
-    popq %rbp
-    ret
- 
-+.section .note.GNU-stack,"",@progbits
---- allegro-4.2.1/src/misc/modexgfx.s~	2006-12-22 14:59:08.000000000 +0100
-+++ allegro-4.2.1/src/misc/modexgfx.s	2006-12-22 14:59:08.000000000 +0100
-@@ -1688,3 +1688,4 @@
- 
- 
- #endif        /* (!defined ALLEGRO_LINUX) || ((defined ALLEGRO_LINUX_VGA) && ... */
-+.section .note.GNU-stack,"",@progbits
---- allegro-4.2.1/src/misc/vbeafs.s~	2006-12-22 14:59:03.000000000 +0100
-+++ allegro-4.2.1/src/misc/vbeafs.s	2006-12-22 14:59:03.000000000 +0100
-@@ -188,3 +188,4 @@
- 
- 
- #endif      /* ifdef VBE/AF is cool on this platform */
-+.section .note.GNU-stack,"",@progbits
---- allegro-4.2.1/src/linux/svgalibs.s~	2006-12-22 15:00:44.000000000 +0100
-+++ allegro-4.2.1/src/linux/svgalibs.s	2006-12-22 15:00:44.000000000 +0100
-@@ -65,3 +65,4 @@
- 
- #endif
- #endif
-+.section .note.GNU-stack,"",@progbits
---- allegro-4.2.1/src/c/cmiscs.s~	2006-12-22 15:00:40.000000000 +0100
-+++ allegro-4.2.1/src/c/cmiscs.s	2006-12-22 15:00:40.000000000 +0100
-@@ -33,3 +33,4 @@
- FUNC(_stub_bank_switch_end)
-    ret
- 
-+.section .note.GNU-stack,"",@progbits
diff --git a/allegro-4.2.0-nostrip.patch b/allegro-4.2.0-nostrip.patch
deleted file mode 100644
index 796f71b..0000000
--- a/allegro-4.2.0-nostrip.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- allegro-4.2.0/misc/deplib.sh.nostrip	2006-01-23 21:35:02.000000000 +0100
-+++ allegro-4.2.0/misc/deplib.sh	2006-01-23 21:35:09.000000000 +0100
-@@ -70,7 +70,7 @@
- done
- echo "$prev"
- echo ""
--write_code alleg LIBALLEG -s
-+write_code alleg LIBALLEG ""
- echo ""
- echo ""
- 
diff --git a/allegro-4.2.1-noexecmod.patch b/allegro-4.2.1-noexecmod.patch
deleted file mode 100644
index ddf8f52..0000000
--- a/allegro-4.2.1-noexecmod.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- allegro-4.2.1/src/x/xdga2s.s~	2006-12-22 16:14:41.000000000 +0100
-+++ allegro-4.2.1/src/x/xdga2s.s	2006-12-22 16:14:41.000000000 +0100
-@@ -24,7 +24,7 @@
- 
- .text
- 
--
-+#if 0 /* this is non PIC and we have a C alternative, so don't use it! */
- #if (!defined ALLEGRO_NO_ASM) && (defined ALLEGRO_XWINDOWS_WITH_XF86DGA2)
- #if (!defined ALLEGRO_WITH_MODULES) || (defined ALLEGRO_MODULE)
- 
-@@ -50,5 +50,6 @@
- 
- #endif
- #endif
-+#endif
- .section .note.GNU-stack,"",@progbits
- 
---- allegro-4.2.1/src/x/xdga2.c~	2006-12-22 16:17:40.000000000 +0100
-+++ allegro-4.2.1/src/x/xdga2.c	2006-12-22 16:17:40.000000000 +0100
-@@ -49,7 +49,7 @@
- static void _xdga2_acquire(BITMAP *bmp);
- static GFX_MODE_LIST *_xdga2_fetch_mode_list(void);
- 
--#ifdef ALLEGRO_NO_ASM
-+#if 1 /* the asm is non PIC and we have a C alternative, so don't use it! */
- uintptr_t _xdga2_write_line(BITMAP *bmp, int line);
- #else
- uintptr_t _xdga2_write_line_asm(BITMAP *bmp, int line);
-@@ -559,7 +559,7 @@
-       /* Hardware acceleration has been requested */
-       
-       /* Updates line switcher to accommodate framebuffer synchronization */
--#ifdef ALLEGRO_NO_ASM
-+#if 1 /* the asm is non PIC and we have a C alternative, so don't use it! */
-       bmp->write_bank = _xdga2_write_line;
-       bmp->read_bank = _xdga2_write_line;
- #else
-@@ -816,7 +816,7 @@
- }
- 
- 
--#ifdef ALLEGRO_NO_ASM
-+#if 1 /* the asm is non PIC and we have a C alternative, so don't use it! */
- 
- /* _xdga2_write_line:
-  *  Returns new line and synchronizes framebuffer if needed.
diff --git a/allegro-4.2.2-fullscreen-viewport.patch b/allegro-4.2.2-fullscreen-viewport.patch
deleted file mode 100644
index 22a7515..0000000
--- a/allegro-4.2.2-fullscreen-viewport.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- allegro-4.2.2/src/x/xwin.c	2009-09-10 22:29:53.000000000 +0200
-+++ allegro-4.2.2.new/src/x/xwin.c	2009-09-10 21:48:21.000000000 +0200
-@@ -2853,6 +2853,13 @@
-       }
-    }
-       
-+   /* Warp the pointer to the upper left corner (where our fs_window is),
-+      this is necessary as the: XF86VidModeSetViewPort() call below does
-+      not seem to do anything on newer Xorg servers, instead the viewport
-+      seems to always be centered at the last mouse cursor position. */
-+   XWarpPointer(_xwin.display, None, XDefaultRootWindow(_xwin.display),
-+                0, 0, 0, 0, 0, 0);
-+
-    /* Switch video mode.  */
-    if ((_xwin.modesinfo[i] == _xwin.orig_modeinfo) ||
-        !XF86VidModeSwitchToMode(_xwin.display, _xwin.screen,
diff --git a/allegro-4.2.3-make.patch b/allegro-4.2.3-make.patch
deleted file mode 100644
index 5f6742d..0000000
--- a/allegro-4.2.3-make.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -up allegro-4.2.3/makefile.in~ allegro-4.2.3/makefile.in
---- allegro-4.2.3/makefile.in~	2007-09-19 15:19:25.000000000 +0200
-+++ allegro-4.2.3/makefile.in	2010-09-09 22:14:34.793000051 +0200
-@@ -406,7 +406,6 @@ examples: $(EXAMPLE_FILES)
- 
- # -------- rules for deleting the generated files --------
- 
--clean:
- 
-    define RM_OBJ_CLEAN_FILES
-       $(foreach file, $(OBJ_CLEAN_FILES), rm -f $(file)
-@@ -418,25 +417,26 @@ clean:
-       )
-    endef
- 
-+clean:
- 	$(RM_OBJ_CLEAN_FILES)
- 	$(RM_OTHER_CLEAN_FILES)
- 
--distclean: clean
- 
-    define RM_DISTCLEAN_FILES
-       $(foreach file, $(DISTCLEAN_FILES) $(ALLEGRO_LIB_X_EXES), rm -f $(file)
-       )
-    endef
- 
-+distclean: clean
- 	$(RM_DISTCLEAN_FILES)
- 
--veryclean: distclean
- 
-    define RM_VERYCLEAN_FILES
-       $(foreach file, $(VERYCLEAN_FILES), rm -f $(file)
-       )
-    endef
- 
-+veryclean: distclean
- 	$(RM_VERYCLEAN_FILES)
- 	rm -f makefile
- 
diff --git a/allegro-4.4.2-doc-install.patch b/allegro-4.4.2-doc-install.patch
new file mode 100644
index 0000000..06f138c
--- /dev/null
+++ b/allegro-4.4.2-doc-install.patch
@@ -0,0 +1,30 @@
+diff -up allegro-4.4.2/docs/CMakeLists.txt~ allegro-4.4.2/docs/CMakeLists.txt
+--- allegro-4.4.2/docs/CMakeLists.txt~	2009-10-31 00:05:30.000000000 +0100
++++ allegro-4.4.2/docs/CMakeLists.txt	2011-07-12 11:24:06.604309215 +0200
+@@ -8,7 +8,7 @@ if(NOT WANT_DOCS OR CMAKE_CROSSCOMPILING
+     return()
+ endif()
+ 
+-set(DOCDIR "doc" CACHE STRING "Install docs into $DOCDIR/allegro-$VERSION")
++set(DOCDIR "share/doc" CACHE STRING "Install docs into $DOCDIR/allegro-$VERSION")
+ set(ACTUAL_DOC_DIR "${DOCDIR}/allegro-${ALLEGRO_VERSION}")
+ 
+ add_executable(makedoc
+@@ -156,7 +156,7 @@ endif(UNIX)
+ #
+ 
+ option(WANT_DOCS_MAN "Generate man pages" on)
+-set(MANDIR "man" CACHE STRING "Install man pages into this directory")
++set(MANDIR "share/man" CACHE STRING "Install man pages into this directory")
+ 
+ if(WANT_DOCS_MAN)
+     set(man_out ${CMAKE_CURRENT_BINARY_DIR}/man/allegro_init.3)
+@@ -187,7 +187,7 @@ endif(WANT_DOCS_MAN)
+ option(WANT_DOCS_INFO "Generate Info document" on)
+ find_program(MAKEINFO NAMES makeinfo)
+ mark_as_advanced(MAKEINFO)
+-set(INFODIR "info" CACHE STRING "Install Info docs into this directory")
++set(INFODIR "share/info" CACHE STRING "Install Info docs into this directory")
+ 
+ if(WANT_DOCS_INFO AND MAKEINFO)
+     set(texi_out ${CMAKE_CURRENT_BINARY_DIR}/texi/allegro.texi)
diff --git a/allegro-4.4.2-dynamic-addons.patch b/allegro-4.4.2-dynamic-addons.patch
new file mode 100644
index 0000000..262c763
--- /dev/null
+++ b/allegro-4.4.2-dynamic-addons.patch
@@ -0,0 +1,16 @@
+diff -up allegro-4.4.2/CMakeLists.txt~ allegro-4.4.2/CMakeLists.txt
+--- allegro-4.4.2/CMakeLists.txt~	2011-03-25 00:18:50.000000000 +0100
++++ allegro-4.4.2/CMakeLists.txt	2011-07-12 11:03:07.975383245 +0200
+@@ -907,11 +907,7 @@ option(WANT_LOADPNG "Enable loadpng" on)
+ option(WANT_LOGG "Enable logg" on)
+ option(WANT_JPGALLEG "Enable JPGAlleg" on)
+ 
+-if(WANT_FRAMEWORKS)
+-    set(ADDON_LINKAGE SHARED)
+-else()
+-    set(ADDON_LINKAGE STATIC)
+-endif()
++set(ADDON_LINKAGE SHARED)
+ 
+ if(WANT_ALLEGROGL)
+     add_subdirectory(addons/allegrogl)
diff --git a/allegro.spec b/allegro.spec
index 4192143..dd67589 100644
--- a/allegro.spec
+++ b/allegro.spec
@@ -1,6 +1,6 @@
 Name:           allegro
-Version:        4.2.3
-Release:        5%{?dist}
+Version:        4.4.2
+Release:        1%{?dist}
 
 Summary:        A game programming library
 Summary(es):    Una libreria de programacion de juegos
@@ -13,19 +13,15 @@ License:        Giftware
 URL:            http://alleg.sourceforge.net/
 Source:         http://downloads.sourceforge.net/alleg/allegro-%{version}.tar.gz
 Patch1:         allegro-4.0.3-cfg.patch
-Patch2:         allegro-4.2.0-nostrip.patch
-Patch3:         allegro-4.2.0-noexecstack.patch
-Patch4:         allegro-4.2.0-multilib.patch
-Patch5:         allegro-4.2.1-noexecmod.patch
-Patch6:         allegro-4.0.3-libdir.patch
-Patch7:         allegro-4.2.2-fullscreen-viewport.patch
-Patch8:         allegro-4.2.3-make.patch
-Patch9:         allegro-4.2.3-pack-formatstring.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  esound-devel, texinfo, perl, arts-devel, glib2-devel
-BuildRequires:  xorg-x11-proto-devel, libX11-devel, libXext-devel, libXt-devel
-BuildRequires:  libXpm-devel, libXcursor-devel, libXxf86vm-devel
-BuildRequires:  libXxf86dga-devel, jack-audio-connection-kit-devel, autoconf
+Patch2:         allegro-4.0.3-libdir.patch
+Patch3:         allegro-4.2.3-pack-formatstring.patch
+Patch4:         allegro-4.4.2-dynamic-addons.patch
+Patch5:         allegro-4.4.2-doc-install.patch
+BuildRequires:  texinfo
+BuildRequires:  xorg-x11-proto-devel libX11-devel libXpm-devel libXcursor-devel
+BuildRequires:  libXxf86vm-devel libXxf86dga-devel libGL-devel
+BuildRequires:  alsa-lib-devel jack-audio-connection-kit-devel
+BuildRequires:  libjpeg-devel libpng-devel libvorbis-devel
 Requires:       timidity++-patches
 %ifarch %{ix86}
 Requires(post): policycoreutils /sbin/ldconfig
@@ -52,6 +48,7 @@ videogiochi ed in altri tipi di programmazione multimediale.
 Allegro je multiplatformní knihovna pro počítačové hry a jiné
 typy multimediálního programování.
 
+
 %package devel
 Summary:        A game programming library
 Summary(es):    Una libreria de programacion de juegos
@@ -59,7 +56,6 @@ Summary(fr):    Une librairie de programmation de jeux
 Summary(it):    Una libreria per la programmazione di videogiochi
 Summary(cs):    Knihovna pro programování her
 Group:          Development/Libraries
-Provides:       %{name}-static = %{version}-%{release}
 Requires:       %{name} = %{version}-%{release}, xorg-x11-proto-devel
 Requires:       libX11-devel, libXcursor-devel
 Requires(post): /sbin/install-info
@@ -90,6 +86,7 @@ Allegro je multiplatformní knihovna pro počítačové hry a jiné
 typy multimediálního programování. Tento balíček je je potřebný
 k sestavení programů napsaných v Allegru.
 
+
 %package tools
 Summary:        Extra tools for the Allegro programming library
 Summary(es):    Herramientas adicionales para la librería de programación Allegro
@@ -99,6 +96,7 @@ Summary(cs):    Přídavné nástroje pro programovou knihovnu Allegro
 Group:          Development/Tools
 Requires:       %{name} = %{version}-%{release}
 
+
 %description tools
 Allegro is a cross-platform library intended for use in computer games
 and other types of multimedia programming. This package contains extra
@@ -127,102 +125,151 @@ Allegro je multiplatformní knihovna pro počítačové hry a jiné
 typy multimediálního programování. Tento balíček obsahuje přídavné nástroje,
 které jsou užitečné pro vývoj Allegro programů.
 
-%package esound-plugin
-Summary:        Allegro Enlightened Sound Daemon plugin
+%package jack-plugin
+Summary:        Allegro JACK (Jack Audio Connection Kit) plugin
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
 
-%description esound-plugin
+%description jack-plugin
 This package contains a plugin for Allegro which enables Allegro to playback
-sound through the Enlightened Sound Daemon (ESD / esound).
+sound through JACK (Jack Audio Connection Kit).
 
-%package arts-plugin
-Summary:        Allegro aRts (analog realtime synthesizer) plugin
+
+%package -n alleggl
+Summary:        OpenGL support library for Allegro
 Group:          System Environment/Libraries
+License:        zlib or GPL+
+URL:            http://allegrogl.sourceforge.net/
 Requires:       %{name} = %{version}-%{release}
 
-%description arts-plugin
-This package contains a plugin for Allegro which enables Allegro to playback
-sound through aRts (analog realtime synthesizer).
+%description -n alleggl
+AllegroGL is an Allegro add-on that allows you to use OpenGL alongside Allegro.
+You use OpenGL for your rendering to the screen, and Allegro for miscellaneous
+tasks like gathering input, doing timers, getting cross-platform portability,
+loading data, and drawing your textures. So this library fills the same hole
+that things like glut do.
 
-%package jack-plugin
-Summary:        Allegro JACK (Jack Audio Connection Kit) plugin
+%package -n alleggl-devel
+Summary:        Development files for alleggl
+Group:          Development/Libraries
+License:        zlib or GPL+
+Requires:       alleggl = %{version}-%{release}
+
+%description -n alleggl-devel
+The alleggl-devel package contains libraries and header files for
+developing applications that use alleggl.
+
+
+%package -n jpgalleg
+Summary:        JPEG library for the Allegro game library
 Group:          System Environment/Libraries
+License:        zlib
+URL:            http://www.ecplusplus.com/index.php?page=projects&pid=1
 Requires:       %{name} = %{version}-%{release}
 
-%description jack-plugin
-This package contains a plugin for Allegro which enables Allegro to playback
-sound through JACK (Jack Audio Connection Kit).
+%description -n jpgalleg
+jpgalleg is a jpeg library for use with the Allegro game library. It allows
+using jpeg's as Allegro bitmaps.
+
+%package -n jpgalleg-devel
+Summary:        Development files for jpgalleg
+Group:          Development/Libraries
+License:        zlib
+Requires:       jpgalleg = %{version}-%{release}
+
+%description -n jpgalleg-devel
+The jpgalleg-devel package contains libraries and header files for
+developing applications that use jpgalleg.
+
+
+%package loadpng
+Summary:        OGG/Vorbis library for the Allegro game library
+Group:          System Environment/Libraries
+License:        Public Domain
+URL:            http://wiki.allegro.cc/index.php?title=LoadPNG
+Requires:       %{name} = %{version}-%{release}
+
+%description loadpng
+loadpng is some glue that makes it easy to use libpng to load and
+save bitmaps from Allegro programs.
+
+%package loadpng-devel
+Summary:        Development files for loadpng
+Group:          Development/Libraries
+License:        Public Domain
+Requires:       %{name}-loadpng = %{version}-%{release}
+
+%description loadpng-devel
+The loadpng-devel package contains libraries and header files for
+developing applications that use loadpng.
+
+
+%package logg
+Summary:        OGG/Vorbis library for the Allegro game library
+Group:          System Environment/Libraries
+License:        MIT
+URL:            http://trent.gamblin.ca/logg/
+Requires:       %{name} = %{version}-%{release}
+
+%description logg
+LOGG is an Allegro add-on library for playing OGG/Vorbis audio files.
+
+%package logg-devel
+Summary:        Development files for logg
+Group:          Development/Libraries
+License:        MIT
+Requires:       %{name}-logg = %{version}-%{release}
+
+%description logg-devel
+The logg-devel package contains libraries and header files for
+developing applications that use logg.
 
 
 %prep
 %setup -q
-%patch1 -p1 -b .config
-%patch2 -p1 -z .nostrip
-%patch3 -p1 -z .noexecstack
-%patch4 -p1 -z .multilib
-%patch5 -p1 -z .noexecmod
-%patch6 -p1 -z .multilib2
-%patch7 -p1 -z .fs-viewport
-%patch8 -p1
-%patch9 -p1
-iconv -f iso-8859-1 -t utf-8 docs/src/allegro._tx > docs/src/allegro._tx.tmp
-mv docs/src/allegro._tx.tmp docs/src/allegro._tx
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 
 %build
-%configure \
-%ifnarch %{ix86}
-  --enable-vga=no --enable-vbeaf=no \
-%endif
-  --enable-svgalib=no \
-  --enable-dbglib=yes \
-  --enable-proflib=yes \
-  --enable-opts=generic
-# GRRR configure insists on adding -fomit-frame-pointer, remove it
-sed -i 's/-fomit-frame-pointer//g' makefile
-# Explicitly set PROG_LDFLAGS to avoid stripping of the utilities
-make CFLAGS="$RPM_OPT_FLAGS" PROG_LDFLAGS="-Wl,--export-dynamic"
+%cmake
+make %{?_smp_mflags}
+
+# Converting text documentation to UTF-8 encoding.
+for f in docs/AUTHORS docs/CHANGES docs/THANKS \
+        docs/info/*.info docs/txt/*.txt docs/man/get_camera_matrix.3 \
+        addons/allegrogl/changelog; do
+    dirname=$(dirname "$f");
+    basename=$(basename "$f");
+    tmppath="${dirname}/${basename}.tmp";
+    iconv -f 'iso-8859-1' -t 'utf-8' "$f" > "$tmppath";
+    mv "$tmppath" "$f";
+done
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install install-man install-info \
-  DESTDIR=$RPM_BUILD_ROOT LDCONFIG=/bin/true
-install -m 755 docs/makedoc $RPM_BUILD_ROOT%{_bindir}/allegro-makedoc
+make install DESTDIR=$RPM_BUILD_ROOT
+# installation of these is broken, because they use a cmake GLOB, but
+# that gets "resolved" when runnning cmake, and at that time the files
+# to install aren't generated yet ...
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html
+install -p -m 644 docs/man/*.3 $RPM_BUILD_ROOT%{_mandir}/man3
+install -p -m 644 docs/html/*.{html,css} \
+    $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html
+# Install some extra files
 install -Dpm 644 allegro.cfg $RPM_BUILD_ROOT%{_sysconfdir}/allegrorc
+install -pm 755 tools/x11/xfixicon.sh $RPM_BUILD_ROOT%{_bindir}
+install -m 755 docs/makedoc $RPM_BUILD_ROOT%{_bindir}/allegro-makedoc
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/allegro
 install -pm 644 keyboard.dat language.dat $RPM_BUILD_ROOT%{_datadir}/allegro
-find demo examples setup -type f -perm +111 -print | xargs rm
-chmod 755 `find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.so"`
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-rm -f $RPM_BUILD_ROOT%{_libdir}/liball{p,d}_unsharable.a
 
 
-%ifarch %{ix86}
-%post
-/sbin/ldconfig   
-# Set SELinux file_context for vga plugin in the policy
-semanage fcontext -a -t textrel_shlib_t \
-  '%{_libdir}/allegro/4\.2\.2/alleg-vga\.so' 2>/dev/null || :
-# Actually change the context
-chcon -t textrel_shlib_t %{_libdir}/allegro/%{version}/alleg-vga.so \
-  2> /dev/null || :
-%else
 %post -p /sbin/ldconfig
-%endif
-
-%ifarch %{ix86}
-%postun
-/sbin/ldconfig
-# SELinux support
-if [ $1 -eq 0 ]; then  # final removal
-  semanage fcontext -d -t textrel_shlib_t \
-    '%{_libdir}/allegro/4\.2\.2/alleg-vga\.so' 2>/dev/null || :
-fi
-%else 
 %postun -p /sbin/ldconfig 
-%endif
 
 %post devel
 /sbin/install-info %{_infodir}/allegro.info %{_infodir}/dir 2>/dev/null || :
@@ -233,42 +280,61 @@ if [ $1 -eq 0 ] ; then
     2>/dev/null || :
 fi
 
+%post -n alleggl -p /sbin/ldconfig
+%postun -n alleggl -p /sbin/ldconfig 
+
+%post -n jpgalleg -p /sbin/ldconfig
+%postun -n jpgalleg -p /sbin/ldconfig
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%post loadpng -p /sbin/ldconfig
+%postun loadpng -p /sbin/ldconfig
+
+%post logg -p /sbin/ldconfig
+%postun logg -p /sbin/ldconfig
 
 
 %files
 %defattr(-,root,root,-)
-%doc readme.txt docs/build/unix.txt docs/build/linux.txt
-%doc AUTHORS CHANGES THANKS
+%doc %{_docdir}/%{name}-%{version}/AUTHORS
+%doc %{_docdir}/%{name}-%{version}/CHANGES
+%doc %{_docdir}/%{name}-%{version}/THANKS
+%doc %{_docdir}/%{name}-%{version}/addons.txt
+%doc %{_docdir}/%{name}-%{version}/faq.txt
+%doc %{_docdir}/%{name}-%{version}/license.txt
+%doc %{_docdir}/%{name}-%{version}/readme.txt
 %config(noreplace) %{_sysconfdir}/allegrorc
-%{_libdir}/liballeg*.so*
+%{_libdir}/liballeg.so.4*
 %{_libdir}/allegro
 %{_datadir}/allegro
-%exclude %{_libdir}/allegro/%{version}/alleg-esddigi.so
-%exclude %{_libdir}/allegro/%{version}/alleg-artsdigi.so
-%exclude %{_libdir}/allegro/%{version}/alleg-jackdigi.so
+%exclude %{_libdir}/allegro/%{version}/alleg-jack.so
 
 %files devel
 %defattr(-,root,root,-)
-%doc docs/txt/abi.txt docs/txt/ahack.txt docs/txt/allegro.txt
-%doc docs/txt/const.txt docs/txt/faq.txt docs/txt/help.txt
-%doc todo.txt docs/html
-%doc demo examples setup
+%doc %{_docdir}/%{name}-%{version}/abi.txt
+%doc %{_docdir}/%{name}-%{version}/ahack.txt
+%doc %{_docdir}/%{name}-%{version}/allegro.txt
+%doc %{_docdir}/%{name}-%{version}/api.txt
+%doc %{_docdir}/%{name}-%{version}/const.txt
+%doc %{_docdir}/%{name}-%{version}/faq.txt
+%doc %{_docdir}/%{name}-%{version}/help.txt
+%doc %{_docdir}/%{name}-%{version}/html
+%doc %{_docdir}/%{name}-%{version}/makedoc.txt
+%doc %{_docdir}/%{name}-%{version}/mistakes.txt
+%doc %{_docdir}/%{name}-%{version}/packfile.txt
 %{_bindir}/allegro-config
 %{_bindir}/allegro-makedoc
-%{_libdir}/liballeg_unsharable.a
-%{_libdir}/liball?.so.*
-%{_libdir}/liball?-%{version}.so
-%{_includedir}/*alleg*
+%{_libdir}/liballeg.so
+%{_libdir}/pkgconfig/allegro.pc
+%{_includedir}/allegro
+%{_includedir}/allegro.h
+%{_includedir}/xalleg.h
 %{_infodir}/allegro.info*
 %{_mandir}/man3/*
-%{_datadir}/aclocal/allegro.m4
 
 %files tools
 %defattr(-,root,root,-)
-%doc tools/plugins/plugins.txt
+%doc %{_docdir}/%{name}-%{version}/dat*.txt
+%doc %{_docdir}/%{name}-%{version}/grabber.txt
 %{_bindir}/colormap
 %{_bindir}/dat
 %{_bindir}/dat2s
@@ -279,21 +345,69 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/pat2dat
 %{_bindir}/rgbmap
 %{_bindir}/textconv
-
-%files esound-plugin
-%defattr(-,root,root,-)
-%{_libdir}/allegro/%{version}/alleg-esddigi.so
-
-%files arts-plugin
-%defattr(-,root,root,-)
-%{_libdir}/allegro/%{version}/alleg-artsdigi.so
+%{_bindir}/xfixicon.sh
 
 %files jack-plugin
 %defattr(-,root,root,-)
-%{_libdir}/allegro/%{version}/alleg-jackdigi.so
+%{_libdir}/allegro/%{version}/alleg-jack.so
+
+%files -n alleggl
+%doc addons/allegrogl/changelog 
+%doc addons/allegrogl/faq.txt
+%doc addons/allegrogl/gpl.txt
+%doc addons/allegrogl/readme.txt
+%doc addons/allegrogl/zlib.txt
+%{_libdir}/liballeggl.so.4*
+
+%files -n alleggl-devel
+%doc addons/allegrogl/bugs.txt
+%doc addons/allegrogl/extensions.txt
+%doc addons/allegrogl/howto.txt
+%doc addons/allegrogl/quickstart.txt
+%doc addons/allegrogl/todo.txt
+%{_libdir}/liballeggl.so
+%{_libdir}/pkgconfig/allegrogl.pc
+%{_includedir}/alleggl.h
+%{_includedir}/allegrogl
+
+%files -n jpgalleg
+%doc addons/jpgalleg/license.txt
+%doc addons/jpgalleg/readme.txt
+%{_libdir}/libjpgalleg.so.4*
+
+%files -n jpgalleg-devel
+%{_libdir}/libjpgalleg.so
+%{_libdir}/pkgconfig/jpgalleg.pc
+%{_includedir}/jpgalleg.h
+
+%files loadpng
+%doc addons/loadpng/CHANGES.txt
+%doc addons/loadpng/README.txt
+%doc addons/loadpng/THANKS.txt
+%{_libdir}/libloadpng.so.4*
+
+%files loadpng-devel
+%{_libdir}/libloadpng.so
+%{_libdir}/pkgconfig/loadpng.pc
+%{_includedir}/loadpng.h
+
+%files logg
+%doc addons/logg/LICENSE.txt
+%{_libdir}/liblogg.so.4*
+
+%files logg-devel
+%{_libdir}/liblogg.so
+%{_libdir}/pkgconfig/logg.pc
+%{_includedir}/logg.h
 
 
 %changelog
+* Tue Jul 12 2011 Hans de Goede <hdegoede@redhat.com> 4.4.2-1
+- New upstream release
+- Partially based on spec file update by Brandon McCaig <bamccaig@gmail.com>
+- Drop a number of no longer relevant patches
+- Now comes with alleggl, jpgalleg, loadpng and logg bundled
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
@@ -415,7 +529,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Mon Mar 13 2006 Hans de Goede <j.w.r.degoede@hhs.nl> 4.2.0-11
 - really, _really_ fix asm stretch code on i386 with NX processors, long
-  story see bugzilla bug 185214 .
+  story see bugzilla bug 185214 .
 
 * Sat Mar 11 2006 Hans de Goede <j.w.r.degoede@hhs.nl> 4.2.0-10
 - really fix asm stretch code on i386 with NX processors, on OpenBSD mprotects
diff --git a/sources b/sources
index a087208..9db2b35 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-36d3e75052da03645039f7da407efca4  allegro-4.2.3.tar.gz
+4db71b0460fc99926ae91d223199c2e6  allegro-4.4.2.tar.gz