January 2016 - openSUSE Commits - openSUSE Mailing Lists

commit perl-Math-BigInt for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '16

05 Jan '16

Hello community, here is the log from the commit of package perl-Math-BigInt for openSUSE:Factory checked in at 2016-01-05 21:55:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Math-BigInt (Old) and /work/SRC/openSUSE:Factory/.perl-Math-BigInt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Math-BigInt" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Math-BigInt/perl-Math-BigInt.changes 2015-11-15 12:48:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Math-BigInt.new/perl-Math-BigInt.changes 2016-01-05 21:56:04.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Jan 4 09:49:46 UTC 2016 - coolo(a)suse.com + +- updated to 1.999714 + see /usr/share/doc/packages/perl-Math-BigInt/CHANGES + +------------------------------------------------------------------- +Sat Jan 2 09:53:48 UTC 2016 - coolo(a)suse.com + +- updated to 1.999713 + see /usr/share/doc/packages/perl-Math-BigInt/CHANGES + +------------------------------------------------------------------- Old: ---- Math-BigInt-1.999710.tar.gz New: ---- Math-BigInt-1.999714.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Math-BigInt.spec ++++++ --- /var/tmp/diff_new_pack.nHpLo1/_old 2016-01-05 21:56:04.000000000 +0100 +++ /var/tmp/diff_new_pack.nHpLo1/_new 2016-01-05 21:56:04.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package perl-Math-BigInt # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: perl-Math-BigInt -Version: 1.999710 +Version: 1.999714 Release: 0 %define cpan_name Math-BigInt Summary: Arbitrary size integer/float math package ++++++ Math-BigInt-1.999710.tar.gz -> Math-BigInt-1.999714.tar.gz ++++++ ++++ 20015 lines of diff (skipped)

1 0

commit phpMyAdmin for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '16

05 Jan '16

Hello community, here is the log from the commit of package phpMyAdmin for openSUSE:Factory checked in at 2016-01-05 21:55:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/phpMyAdmin (Old) and /work/SRC/openSUSE:Factory/.phpMyAdmin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "phpMyAdmin" Changes: -------- --- /work/SRC/openSUSE:Factory/phpMyAdmin/phpMyAdmin.changes 2016-01-01 19:50:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.phpMyAdmin.new/phpMyAdmin.changes 2016-01-05 21:56:00.000000000 +0100 @@ -1,0 +2,30 @@ +Mon Jan 4 21:39:35 UTC 2016 - astieger(a)suse.com + +- phpMyAdmin 4.5.3.1: + * Minimum requirement is PHP 5.5 +- Highlights of the 4.5.x.x series: + * Improvements to the Console feature + * Include structure in PDF export + * Validate data before import + * Support CHECKSUM TABLE operation + * Improved operations regarding partitions + * Alter privileges when renaming or copying a database or table + * Several improvements related to speed and responsiveness + * Improved print view + * Use CTRL or ALT plus arrow keys to navigate in grid editor + * Use plain-English destinations for + $cfg['NavigationTreeDefaultTabTable'], $cfg['DefaultTabServer'], + $cfg['DefaultTabDatabase'], and $cfg['DefaultTabTable']. + The old style values will still work, but this makes it easier for + new users to easily understand the destination links. + * Integrate SQL debugging into Console + * Restore row editing when no unique/primary key exists + * Allow exporting one file per table and one file per database + * Improvements to using multiple servers with the auth_type cookie + * Support virtual columns (MySQL 5.7.5+) + * Add or improve support for several MariaDB features including + process list and virtual/persistent columns + * Improved handling of cached data when upgrading phpMyAdmin + * Add SHA256 security password support + +------------------------------------------------------------------- @@ -6 +36 @@ - * PMASA-2015-5 (CVE-2015-8669, CWE-661 CWE-200) + * PMASA-2015-5 (CVE-2015-8669, CWE-661 CWE-200) boo#960282 Old: ---- phpMyAdmin-4.4.15.2-all-languages.tar.xz phpMyAdmin-4.4.15.2-all-languages.tar.xz.asc New: ---- phpMyAdmin-4.5.3.1-all-languages.tar.xz phpMyAdmin-4.5.3.1-all-languages.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phpMyAdmin.spec ++++++ --- /var/tmp/diff_new_pack.7CMxeX/_old 2016-01-05 21:56:01.000000000 +0100 +++ /var/tmp/diff_new_pack.7CMxeX/_new 2016-01-05 21:56:01.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package phpMyAdmin # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,7 +29,7 @@ %define ap_grp nogroup %endif Name: phpMyAdmin -Version: 4.4.15.2 +Version: 4.5.3.1 Release: 0 Summary: Administration of MySQL over the web License: GPL-2.0+ @@ -48,7 +48,7 @@ BuildRequires: python-devel BuildRequires: xz # -Requires: mod_php_any +Requires: mod_php_any >= 5.5 Requires: php-bz2 Requires: php-gd Requires: php-iconv ++++++ phpMyAdmin-4.4.15.2-all-languages.tar.xz -> phpMyAdmin-4.5.3.1-all-languages.tar.xz ++++++ ++++ 113776 lines of diff (skipped) ++++++ phpMyAdmin-config.patch ++++++ --- /var/tmp/diff_new_pack.7CMxeX/_old 2016-01-05 21:56:03.000000000 +0100 +++ /var/tmp/diff_new_pack.7CMxeX/_new 2016-01-05 21:56:03.000000000 +0100 @@ -2,12 +2,10 @@ =================================================================== --- config.sample.inc.php.orig +++ config.sample.inc.php -@@ -10,66 +10,237 @@ - * @package PhpMyAdmin +@@ -11,13 +11,76 @@ */ --/* -+/** + /** + * Your phpMyAdmin url + * + * Complete the variable below with the full url ie @@ -72,10 +70,9 @@ */ -$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */ +$cfg['blowfish_secret'] = ''; - --/* + -+/****************************************************************************** + + /** * Servers configuration + * + * for more info/explanation about these VARS have look at @@ -83,8 +80,7 @@ */ $i = 0; --/* -+/** +@@ -25,47 +88,158 @@ $i = 0; * First server */ $i++; @@ -95,9 +91,7 @@ -$cfg['Servers'][$i]['connect_type'] = 'tcp'; -$cfg['Servers'][$i]['compress'] = false; -$cfg['Servers'][$i]['AllowNoPassword'] = false; - --/* -- * phpMyAdmin configuration storage settings. ++ +$cfg['Servers'][$i]['host'] = 'localhost'; +$cfg['Servers'][$i]['port'] = ''; +$cfg['Servers'][$i]['socket'] = ''; @@ -119,9 +113,10 @@ +$cfg['Servers'][$i]['AllowDeny']['order'] = ''; +$cfg['Servers'][$i]['AllowDeny']['rules'] = array(); + -+ -+/* phpMyAdmin configuration storage settings */ -+/** + + /** + * phpMyAdmin configuration storage settings. ++ * + * for more info/explanation about these VARS have look at + * libraries/config.default.php */ @@ -157,6 +152,8 @@ -// $cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding'; -// $cfg['Servers'][$i]['savedsearches'] = 'pma__savedsearches'; -// $cfg['Servers'][$i]['central_columns'] = 'pma__central_columns'; +-// $cfg['Servers'][$i]['designer_settings'] = 'pma__designer_settings'; +-// $cfg['Servers'][$i]['export_templates'] = 'pma__export_templates'; -/* Contrib / Swekey authentication */ -// $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey-pma.conf'; + @@ -195,16 +192,17 @@ +$cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding'; +$cfg['Servers'][$i]['savedsearches'] = 'pma__savedsearches'; +$cfg['Servers'][$i]['central_columns'] = 'pma__central_columns'; ++$cfg['Servers'][$i]['designer_settings'] = 'pma__designer_settings'; ++$cfg['Servers'][$i]['export_templates'] = 'pma__export_templates'; +/* $cfg['Servers'][$i]['auth_swekey_config'] = ''; + + + -+/*************************************** ++/** + * Second Server + */ - - /* -- * End of servers configuration ++ ++/* +$i++; +$cfg['Servers'][$i]['host'] = 'localhost'; +$cfg['Servers'][$i]['port'] = ''; @@ -230,9 +228,9 @@ + +/* + * phpMyAdmin configuration storage settings. - */ - - /* ++ */ ++ ++/* +$cfg['Servers'][$i]['controlhost'] = 'localhost'; +$cfg['Servers'][$i]['controlport'] = ''; +$cfg['Servers'][$i]['controluser'] = 'pma'; @@ -255,6 +253,8 @@ +$cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding'; +$cfg['Servers'][$i]['savedsearches'] = 'pma__savedsearches'; +$cfg['Servers'][$i]['central_columns'] = 'pma__central_columns'; ++$cfg['Servers'][$i]['designer_settings'] = 'pma__designer_settings'; ++$cfg['Servers'][$i]['export_templates'] = 'pma__export_templates'; +$cfg['Servers'][$i]['auth_swekey_config'] = ''; +*/ + @@ -270,15 +270,14 @@ +$cfg['ServerDefault'] = 1; +$cfg['Server'] = '0'; +unset($cfg['Servers'][0]); -+ -+/** -+ * End of servers configuration -+ */ -+ -+/****************************************************************************** - * Directories for saving/loading files from server + + /** + * End of servers configuration +@@ -155,3 +329,4 @@ $cfg['SaveDir'] = ''; + * You can find more configuration options in the documentation + * in the doc/ folder or at <http://docs.phpmyadmin.net/>. */ - $cfg['UploadDir'] = ''; ++ Index: libraries/vendor_config.php =================================================================== --- libraries/vendor_config.php.orig @@ -305,11 +304,11 @@ /** * Whether setup requires writable directory where config -@@ -47,7 +47,7 @@ define('EXAMPLES_DIR', './examples/'); +@@ -46,7 +46,7 @@ define('SQL_DIR', './sql/'); * It is not used directly in code, just a convenient * define used further in this file. */ --define('CONFIG_DIR', './'); +-define('CONFIG_DIR', ''); +define('CONFIG_DIR', '@sysconfdir@/'); /**

1 0

commit meson for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '16

05 Jan '16

Hello community, here is the log from the commit of package meson for openSUSE:Factory checked in at 2016-01-05 21:55:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/meson (Old) and /work/SRC/openSUSE:Factory/.meson.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "meson" Changes: -------- --- /work/SRC/openSUSE:Factory/meson/meson.changes 2015-12-06 07:41:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.meson.new/meson.changes 2016-01-05 21:55:58.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 29 05:32:40 UTC 2015 - sor.alexei(a)meowr.ru + +- Update to 0.28.0. + +------------------------------------------------------------------- Old: ---- meson_0.27.0.tar.gz meson_0.27.0.tar.gz.asc New: ---- meson_0.28.0.tar.gz meson_0.28.0.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ meson.spec ++++++ --- /var/tmp/diff_new_pack.giCN2T/_old 2016-01-05 21:55:59.000000000 +0100 +++ /var/tmp/diff_new_pack.giCN2T/_new 2016-01-05 21:55:59.000000000 +0100 @@ -17,7 +17,7 @@ Name: meson -Version: 0.27.0 +Version: 0.28.0 Release: 0 Summary: High productivity build system License: Apache-2.0 ++++++ meson_0.27.0.tar.gz -> meson_0.28.0.tar.gz ++++++ ++++ 3152 lines of diff (skipped)

1 0

commit vlc for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '16

05 Jan '16

Hello community, here is the log from the commit of package vlc for openSUSE:Factory checked in at 2016-01-05 21:55:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vlc (Old) and /work/SRC/openSUSE:Factory/.vlc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vlc" Changes: -------- --- /work/SRC/openSUSE:Factory/vlc/vlc.changes 2015-12-13 09:39:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.vlc.new/vlc.changes 2016-01-05 21:55:56.000000000 +0100 @@ -1,0 +2,14 @@ +Mon Dec 28 06:49:35 UTC 2015 - wbauer(a)tmo.at + +- Build against libQt5X11Extras5 on Leap as well to make video + integration into the GUI work (boo#953693) +- Also add BuildRequires: pkgconfig(xi), without it the build fails + on Leap now + +------------------------------------------------------------------- +Tue Dec 15 09:30:13 UTC 2015 - dimstar(a)opensuse.org + +- Enable libupnp support on Leap 42.1: the library is available + (boo#959100). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vlc.spec ++++++ --- /var/tmp/diff_new_pack.Oh9wSZ/_old 2016-01-05 21:55:58.000000000 +0100 +++ /var/tmp/diff_new_pack.Oh9wSZ/_new 2016-01-05 21:55:58.000000000 +0100 @@ -81,8 +81,10 @@ BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Widgets) -%if 0%{?suse_version} != 1315 +%if 0%{?suse_version} != 1315 || 0%{?is_opensuse} BuildRequires: pkgconfig(Qt5X11Extras) +# for some reason libXi-devel is explicitly needed on Leap 42.1, otherwise the build fails... +BuildRequires: pkgconfig(xi) %endif %else BuildRequires: libqt4-devel >= 4.6.0 @@ -137,7 +139,7 @@ BuildRequires: pkgconfig(libswscale) %endif %if 0%{?suse_version} > 1110 -%if 0%{?suse_version} != 1315 +%if 0%{?suse_version} != 1315 || 0%{?is_opensuse} BuildRequires: pkgconfig(SDL_image) >= 1.2.10 BuildRequires: pkgconfig(libprojectM) >= 2.0.0 BuildRequires: pkgconfig(libupnp) @@ -377,7 +379,7 @@ %endif --enable-libcddb \ %if 0%{?suse_version} > 1110 -%if 0%{?suse_version} != 1315 +%if 0%{?suse_version} != 1315 || 0%{?is_opensuse} --enable-opencv \ %endif %endif @@ -540,7 +542,7 @@ %{_libdir}/vlc/plugins/codec/liblibass_plugin.so %endif %if 0%{?suse_version} > 1110 -%if 0%{?suse_version} != 1315 +%if 0%{?suse_version} != 1315 || 0%{?is_opensuse} %{_libdir}/vlc/plugins/codec/libsdl_image_plugin.so %endif %endif @@ -560,7 +562,7 @@ %{_libdir}/vlc/plugins/visualization/libglspectrum_plugin.so %{_libdir}/vlc/plugins/video_output/libaa_plugin.so %if 0%{?suse_version} > 1110 -%if 0%{?suse_version} != 1315 +%if 0%{?suse_version} != 1315 || 0%{?is_opensuse} %{_libdir}/vlc/plugins/visualization/libprojectm_plugin.so %endif %endif @@ -950,7 +952,7 @@ %{_libdir}/vlc/plugins/services_discovery/libsap_plugin.so %{_libdir}/vlc/plugins/services_discovery/libudev_plugin.so %if 0%{?suse_version} > 1110 -%if 0%{?suse_version} != 1315 +%if 0%{?suse_version} != 1315 || 0%{?is_opensuse} %{_libdir}/vlc/plugins/services_discovery/libupnp_plugin.so %endif %endif @@ -1044,7 +1046,7 @@ %{_libdir}/vlc/plugins/video_filter/libmotionblur_plugin.so %{_libdir}/vlc/plugins/video_filter/libmotiondetect_plugin.so %if 0%{?suse_version} > 1110 -%if 0%{?suse_version} != 1315 +%if 0%{?suse_version} != 1315 || 0%{?is_opensuse} %{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so %{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so %endif

1 0

commit laptop-mode-tools for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '16

05 Jan '16

Hello community, here is the log from the commit of package laptop-mode-tools for openSUSE:Factory checked in at 2016-01-05 21:55:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/laptop-mode-tools (Old) and /work/SRC/openSUSE:Factory/.laptop-mode-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "laptop-mode-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/laptop-mode-tools/laptop-mode-tools.changes 2015-11-10 10:03:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.laptop-mode-tools.new/laptop-mode-tools.changes 2016-01-05 21:55:55.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Jan 4 12:48:43 UTC 2016 - rmilasan(a)suse.com + +- Fix lmt-udev installation location (bsc#960497). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ laptop-mode-tools.spec ++++++ --- /var/tmp/diff_new_pack.XMrTQZ/_old 2016-01-05 21:55:56.000000000 +0100 +++ /var/tmp/diff_new_pack.XMrTQZ/_new 2016-01-05 21:55:56.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package laptop-mode-tools # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,6 +17,8 @@ %{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d} +%{!?_udevdir:%global _udevdir %{_libexecdir}/udev} + Name: laptop-mode-tools Version: 1.67 Release: 0 @@ -64,15 +66,13 @@ %build %install -DESTDIR=%{buildroot} MAN_D=%{_mandir} INSTALL=install INIT_D=%{_initddir} LIB_D=%{_libdir} UDEV_D=%{_udevrulesdir} SYSTEMD_UNIT_D=%{_unitdir} ACPI=DISABLED PMU=disabled APM=disabled ./install.sh +DESTDIR=%{buildroot} MAN_D=%{_mandir} INSTALL=install INIT_D=%{_initddir} LIB_D=%{_libdir} UDEV_D=%{_udevdir} SYSTEMD_UNIT_D=%{_unitdir} ACPI=DISABLED PMU=disabled APM=disabled ./install.sh %if 0%{?suse_version} < 1315 install -D -m 0755 %{SOURCE1} %{buildroot}%{_libexecdir}/pm-utils/power.d/laptop-mode-tools %endif chmod 644 %{buildroot}/%{_mandir}/man8/* # Don't ship sysvinit script rm -r %{buildroot}%{_sysconfdir}/init.d -# Fix a weird issue... -mv %{buildroot}%{_udevrulesdir}/rules.d/99-laptop-mode.rules %{buildroot}%{_udevrulesdir}/99-laptop-mode.rules # Hack to remove sysvinit script link in usr/sbin ln -s service %{buildroot}/%{_sbindir}/rclaptop-mode %if 0%{?suse_version} > 1315 @@ -114,7 +114,7 @@ %{_libexecdir}/pm-utils/power.d/laptop-mode-tools %endif %{_sbindir}/rclaptop-mode -%{_udevrulesdir}/lmt-udev +%{_udevdir}/lmt-udev %{_udevrulesdir}/99-laptop-mode.rules %if 0%{?suse_version} < 1315 %{_libexecdir}/pm-utils/sleep.d/01laptop-mode

1 0

commit ghc-GLUT for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '16

05 Jan '16

Hello community, here is the log from the commit of package ghc-GLUT for openSUSE:Factory checked in at 2016-01-05 21:55:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-GLUT (Old) and /work/SRC/openSUSE:Factory/.ghc-GLUT.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-GLUT" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-GLUT/ghc-GLUT.changes 2015-12-29 12:59:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-GLUT.new/ghc-GLUT.changes 2016-01-05 21:55:54.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Jan 4 12:25:40 UTC 2016 - mimi.vx(a)gmail.com + +- update to 2.7.0.5 +* Make things work with both old and new OpenGLRaw/GLURaw packages. + +------------------------------------------------------------------- Old: ---- GLUT-2.7.0.4.tar.gz New: ---- GLUT-2.7.0.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-GLUT.spec ++++++ --- /var/tmp/diff_new_pack.KJ30CT/_old 2016-01-05 21:55:55.000000000 +0100 +++ /var/tmp/diff_new_pack.KJ30CT/_new 2016-01-05 21:55:55.000000000 +0100 @@ -18,7 +18,7 @@ %global pkg_name GLUT Name: ghc-GLUT -Version: 2.7.0.4 +Version: 2.7.0.5 Release: 0 Summary: A binding for the OpenGL Utility Toolkit License: BSD-3-Clause @@ -33,6 +33,7 @@ BuildRequires: ghc-StateVar-devel BuildRequires: ghc-array-devel BuildRequires: ghc-containers-devel +BuildRequires: ghc-random-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-transformers-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ GLUT-2.7.0.4.tar.gz -> GLUT-2.7.0.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GLUT-2.7.0.4/CHANGELOG.md new/GLUT-2.7.0.5/CHANGELOG.md --- old/GLUT-2.7.0.4/CHANGELOG.md 2015-12-22 10:49:21.000000000 +0100 +++ new/GLUT-2.7.0.5/CHANGELOG.md 2016-01-03 23:53:35.000000000 +0100 @@ -1,3 +1,8 @@ +2.7.0.5 +-------- +* Make things work with both old and new `OpenGLRaw`/`GLURaw` packages. +* Build all examples via cabal, no need for `make` anymore. + 2.7.0.4 -------- * Relaxed upper version bound for `transformers`. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GLUT-2.7.0.4/GLUT.cabal new/GLUT-2.7.0.5/GLUT.cabal --- old/GLUT-2.7.0.4/GLUT.cabal 2015-12-22 10:49:21.000000000 +0100 +++ new/GLUT-2.7.0.5/GLUT.cabal 2016-01-03 23:53:35.000000000 +0100 @@ -1,5 +1,5 @@ name: GLUT -version: 2.7.0.4 +version: 2.7.0.5 synopsis: A binding for the OpenGL Utility Toolkit description: A Haskell binding for the OpenGL Utility Toolkit, a window system independent @@ -8,7 +8,7 @@ <http://www.opengl.org/resources/libraries/glut/>. homepage: http://www.haskell.org/haskellwiki/Opengl bug-reports: https://github.com/haskell-opengl/GLUT/issues -copyright: Copyright (C) 2002-2015 Sven Panne +copyright: Copyright (C) 2002-2016 Sven Panne license: BSD3 license-file: LICENSE author: Sven Panne @@ -21,129 +21,28 @@ README.md examples/00-README examples/BOGLGP/00-README - examples/BOGLGP/Chapter01/Makefile - examples/BOGLGP/Chapter01/OnYourOwn1.hs - examples/BOGLGP/Chapter01/Simple.hs - examples/BOGLGP/Chapter02/Makefile - examples/BOGLGP/Chapter02/OnYourOwn1.hs - examples/BOGLGP/Chapter02/OpenGLApplication.hs - examples/BOGLGP/Chapter03/Lines.hs - examples/BOGLGP/Chapter03/Makefile - examples/BOGLGP/Chapter03/OnYourOwn1.hs - examples/BOGLGP/Chapter03/Points.hs - examples/BOGLGP/Chapter03/Polygons.hs - examples/BOGLGP/Chapter03/TrianglesQuads.hs - examples/BOGLGP/Makefile - examples/Makefile examples/Misc/00-README - examples/Misc/ARBOcclude.hs - examples/Misc/ColorTriangle/ColorTriangle.hs - examples/Misc/ColorTriangle/Makefile examples/Misc/ColorTriangle/color_triangles.frag examples/Misc/ColorTriangle/color_triangles.vert - examples/Misc/ExtractContours.hs - examples/Misc/Gears.hs - examples/Misc/Makefile - examples/Misc/Pitfall14.hs - examples/Misc/SmoothOpenGL3.hs - examples/Misc/Triangulate.hs examples/OrangeBook/00-README examples/OrangeBook/3Dlabs-License.txt - examples/OrangeBook/Makefile examples/OrangeBook/ogl2brick/Brick.frag - examples/OrangeBook/ogl2brick/Brick.hs examples/OrangeBook/ogl2brick/Brick.vert - examples/OrangeBook/ogl2brick/Makefile examples/RedBook4/00-README - examples/RedBook4/AAIndex.hs - examples/RedBook4/AARGB.hs - examples/RedBook4/AccAnti.hs - examples/RedBook4/AccPersp.hs - examples/RedBook4/Alpha.hs - examples/RedBook4/Alpha3D.hs - examples/RedBook4/BezCurve.hs - examples/RedBook4/BezMesh.hs - examples/RedBook4/BezSurf.hs - examples/RedBook4/BlendEqn.hs - examples/RedBook4/Checker.hs - examples/RedBook4/Clip.hs - examples/RedBook4/ColorMat.hs - examples/RedBook4/ColorMatrix.hs - examples/RedBook4/ColorTable.hs - examples/RedBook4/Combiner.hs - examples/RedBook4/Convolution.hs - examples/RedBook4/Cube.hs - examples/RedBook4/CubeMap.hs - examples/RedBook4/DList.hs - examples/RedBook4/DOF.hs examples/RedBook4/Data/leeds.bin - examples/RedBook4/Double.hs - examples/RedBook4/DrawF.hs - examples/RedBook4/Feedback.hs - examples/RedBook4/Fog.hs - examples/RedBook4/FogCoord.hs - examples/RedBook4/FogIndex.hs - examples/RedBook4/Font.hs - examples/RedBook4/Hello.hs - examples/RedBook4/Histogram.hs - examples/RedBook4/Image.hs - examples/RedBook4/Light.hs - examples/RedBook4/Lines.hs - examples/RedBook4/MVArray.hs - examples/RedBook4/Makefile - examples/RedBook4/Material.hs - examples/RedBook4/Minmax.hs - examples/RedBook4/Mipmap.hs - examples/RedBook4/Model.hs - examples/RedBook4/MoveLight.hs - examples/RedBook4/MultiTex.hs - examples/RedBook4/Multisamp.hs - examples/RedBook4/PickDepth.hs - examples/RedBook4/PickSquare.hs - examples/RedBook4/Planet.hs - examples/RedBook4/PointP.hs - examples/RedBook4/PolyOff.hs - examples/RedBook4/Polys.hs - examples/RedBook4/Quadric.hs - examples/RedBook4/ReadImage.hs - examples/RedBook4/Robot.hs - examples/RedBook4/Scene.hs - examples/RedBook4/Select.hs - examples/RedBook4/ShadowMap.hs - examples/RedBook4/Smooth.hs - examples/RedBook4/Stencil.hs - examples/RedBook4/Stroke.hs - examples/RedBook4/SurfPoints.hs - examples/RedBook4/Surface.hs - examples/RedBook4/Teapots.hs - examples/RedBook4/Tess.hs - examples/RedBook4/TessWind.hs - examples/RedBook4/TexBind.hs - examples/RedBook4/TexGen.hs - examples/RedBook4/TexProx.hs - examples/RedBook4/TexSub.hs - examples/RedBook4/Texture3D.hs - examples/RedBook4/TextureSurf.hs - examples/RedBook4/Torus.hs - examples/RedBook4/Trim.hs - examples/RedBook4/UnProject.hs - examples/RedBook4/VArray.hs - examples/RedBook4/Wrap.hs examples/RedBook8/00-README - examples/RedBook8/Chapter01/Makefile examples/RedBook8/Chapter01/triangles.frag - examples/RedBook8/Chapter01/Triangles.hs examples/RedBook8/Chapter01/triangles.vert - examples/RedBook8/common/LoadShaders.hs - examples/RedBook8/common/Makefile - examples/RedBook8/Makefile - examples/examples.mk flag UseNativeWindowsLibraries description: When compiling under Windows, use the native libraries instead of e.g. the ones coming with Cygwin. +flag BuildExamples + description: Build various OpenGL/GLUT examples. + default: False + library exposed-modules: Graphics.UI.GLUT @@ -180,8 +79,7 @@ containers >= 0.3 && < 0.6, transformers >= 0.2 && < 0.6, StateVar >= 1.1 && < 1.2, - OpenGLRaw >= 2.3 && < 2.7, - OpenGL >= 2.12 && < 2.14 + OpenGL >= 2.12 && < 3.1 default-language: Haskell2010 other-extensions: CPP ghc-options: -Wall @@ -200,6 +98,814 @@ else extra-libraries: glut +executable BOGLGP01-OnYourOwn1 + if !flag(BuildExamples) + buildable: False + main-is: OnYourOwn1.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/BOGLGP/Chapter01 + default-language: Haskell2010 + ghc-options: -Wall + +executable BOGLGP01-Simple + if !flag(BuildExamples) + buildable: False + main-is: Simple.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/BOGLGP/Chapter01 + default-language: Haskell2010 + ghc-options: -Wall + +executable BOGLGP02-OnYourOwn1.hs + if !flag(BuildExamples) + buildable: False + main-is: OnYourOwn1.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/BOGLGP/Chapter02 + default-language: Haskell2010 + ghc-options: -Wall + +executable BOGLGP02-OpenGLApplication.hs + if !flag(BuildExamples) + buildable: False + main-is: OpenGLApplication.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/BOGLGP/Chapter02 + default-language: Haskell2010 + ghc-options: -Wall + +executable BOGLGP03-Lines + if !flag(BuildExamples) + buildable: False + main-is: Lines.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/BOGLGP/Chapter03 + default-language: Haskell2010 + ghc-options: -Wall + +executable BOGLGP03-OnYourOwn1 + if !flag(BuildExamples) + buildable: False + main-is: OnYourOwn1.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/BOGLGP/Chapter03 + default-language: Haskell2010 + ghc-options: -Wall + +executable BOGLGP03-Points + if !flag(BuildExamples) + buildable: False + main-is: Points.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/BOGLGP/Chapter03 + default-language: Haskell2010 + ghc-options: -Wall + +executable BOGLGP03-Polygons + if !flag(BuildExamples) + buildable: False + main-is: Polygons.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/BOGLGP/Chapter03 + default-language: Haskell2010 + ghc-options: -Wall + +executable BOGLGP03-TrianglesQuads + if !flag(BuildExamples) + buildable: False + main-is: TrianglesQuads.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/BOGLGP/Chapter03 + default-language: Haskell2010 + ghc-options: -Wall + +executable Misc-ARBOcclude + if !flag(BuildExamples) + buildable: False + main-is: ARBOcclude.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/Misc + default-language: Haskell2010 + ghc-options: -Wall + +executable Misc-ColorTriangle + if !flag(BuildExamples) + buildable: False + main-is: ColorTriangle.hs + other-modules: LoadShaders + build-depends: base >= 3 && < 5, bytestring >= 0.9 && < 0.11, GLUT + hs-source-dirs: examples/Misc/ColorTriangle, examples/RedBook8/common + default-language: Haskell2010 + ghc-options: -Wall + +executable Misc-ExtractContours + if !flag(BuildExamples) + buildable: False + main-is: ExtractContours.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/Misc + default-language: Haskell2010 + ghc-options: -Wall + +executable Misc-Gears + if !flag(BuildExamples) + buildable: False + main-is: Gears.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/Misc + default-language: Haskell2010 + ghc-options: -Wall + +executable Misc-Pitfall14 + if !flag(BuildExamples) + buildable: False + main-is: Pitfall14.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/Misc + default-language: Haskell2010 + ghc-options: -Wall + +executable Misc-SmoothOpenGL3 + if !flag(BuildExamples) + buildable: False + main-is: SmoothOpenGL3.hs + build-depends: base >= 3 && < 5, bytestring >= 0.9 && < 0.11, OpenGLRaw >= 1.0 && < 3.1, GLUT + hs-source-dirs: examples/Misc + default-language: Haskell2010 + ghc-options: -Wall + +executable Misc-Triangulate + if !flag(BuildExamples) + buildable: False + main-is: Triangulate.hs + build-depends: base >= 3 && < 5, random >= 1.0 && < 1.2, GLUT + hs-source-dirs: examples/Misc + default-language: Haskell2010 + ghc-options: -Wall + +executable OrangeBook-Brick + if !flag(BuildExamples) + buildable: False + main-is: Brick.hs + build-depends: base >= 3 && < 5, bytestring >= 0.9 && < 0.11, GLUT + hs-source-dirs: examples/OrangeBook/ogl2brick + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-AAIndex + if !flag(BuildExamples) + buildable: False + main-is: AAIndex.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-AARGB + if !flag(BuildExamples) + buildable: False + main-is: AARGB.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-AccAnti + if !flag(BuildExamples) + buildable: False + main-is: AccAnti.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-AccPersp + if !flag(BuildExamples) + buildable: False + main-is: AccPersp.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Alpha + if !flag(BuildExamples) + buildable: False + main-is: Alpha.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Alpha3D + if !flag(BuildExamples) + buildable: False + main-is: Alpha3D.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-BezCurve + if !flag(BuildExamples) + buildable: False + main-is: BezCurve.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-BezMesh + if !flag(BuildExamples) + buildable: False + main-is: BezMesh.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-BezSurf + if !flag(BuildExamples) + buildable: False + main-is: BezSurf.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-BlendEqn + if !flag(BuildExamples) + buildable: False + main-is: BlendEqn.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Checker + if !flag(BuildExamples) + buildable: False + main-is: Checker.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Clip + if !flag(BuildExamples) + buildable: False + main-is: Clip.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-ColorMat + if !flag(BuildExamples) + buildable: False + main-is: ColorMat.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-ColorMatrix + if !flag(BuildExamples) + buildable: False + main-is: ColorMatrix.hs + other-modules: ReadImage + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-ColorTable + if !flag(BuildExamples) + buildable: False + main-is: ColorTable.hs + other-modules: ReadImage + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Combiner + if !flag(BuildExamples) + buildable: False + main-is: Combiner.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Convolution + if !flag(BuildExamples) + buildable: False + main-is: Convolution.hs + other-modules: ReadImage + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Cube + if !flag(BuildExamples) + buildable: False + main-is: Cube.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-CubeMap + if !flag(BuildExamples) + buildable: False + main-is: CubeMap.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-DList + if !flag(BuildExamples) + buildable: False + main-is: DList.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-DOF + if !flag(BuildExamples) + buildable: False + main-is: DOF.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Double + if !flag(BuildExamples) + buildable: False + main-is: Double.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-DrawF + if !flag(BuildExamples) + buildable: False + main-is: DrawF.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Feedback + if !flag(BuildExamples) + buildable: False + main-is: Feedback.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Fog + if !flag(BuildExamples) + buildable: False + main-is: Fog.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-FogCoord + if !flag(BuildExamples) + buildable: False + main-is: FogCoord.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-FogIndex + if !flag(BuildExamples) + buildable: False + main-is: FogIndex.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Font + if !flag(BuildExamples) + buildable: False + main-is: Font.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Hello + if !flag(BuildExamples) + buildable: False + main-is: Hello.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Histogram + if !flag(BuildExamples) + buildable: False + main-is: Histogram.hs + other-modules: ReadImage + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Image + if !flag(BuildExamples) + buildable: False + main-is: Image.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Light + if !flag(BuildExamples) + buildable: False + main-is: Light.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Lines + if !flag(BuildExamples) + buildable: False + main-is: Lines.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-MVArray + if !flag(BuildExamples) + buildable: False + main-is: MVArray.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Material + if !flag(BuildExamples) + buildable: False + main-is: Material.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Minmax + if !flag(BuildExamples) + buildable: False + main-is: Minmax.hs + other-modules: ReadImage + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Mipmap + if !flag(BuildExamples) + buildable: False + main-is: Mipmap.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Model + if !flag(BuildExamples) + buildable: False + main-is: Model.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-MoveLight + if !flag(BuildExamples) + buildable: False + main-is: MoveLight.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-MultiTex + if !flag(BuildExamples) + buildable: False + main-is: MultiTex.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Multisamp + if !flag(BuildExamples) + buildable: False + main-is: Multisamp.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-PickDepth + if !flag(BuildExamples) + buildable: False + main-is: PickDepth.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-PickSquare + if !flag(BuildExamples) + buildable: False + main-is: PickSquare.hs + build-depends: base >= 3 && < 5, array >= 0.1 && < 0.6, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Planet + if !flag(BuildExamples) + buildable: False + main-is: Planet.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-PointP + if !flag(BuildExamples) + buildable: False + main-is: PointP.hs + build-depends: base >= 3 && < 5, random >= 1.0 && < 1.2, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-PolyOff + if !flag(BuildExamples) + buildable: False + main-is: PolyOff.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Polys + if !flag(BuildExamples) + buildable: False + main-is: Polys.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Quadric + if !flag(BuildExamples) + buildable: False + main-is: Quadric.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Robot + if !flag(BuildExamples) + buildable: False + main-is: Robot.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Scene + if !flag(BuildExamples) + buildable: False + main-is: Scene.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Select + if !flag(BuildExamples) + buildable: False + main-is: Select.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-ShadowMap + if !flag(BuildExamples) + buildable: False + main-is: ShadowMap.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Smooth + if !flag(BuildExamples) + buildable: False + main-is: Smooth.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Stencil + if !flag(BuildExamples) + buildable: False + main-is: Stencil.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Stroke + if !flag(BuildExamples) + buildable: False + main-is: Stroke.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-SurfPoints + if !flag(BuildExamples) + buildable: False + main-is: SurfPoints.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Surface + if !flag(BuildExamples) + buildable: False + main-is: Surface.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Teapots + if !flag(BuildExamples) + buildable: False + main-is: Teapots.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Tess + if !flag(BuildExamples) + buildable: False + main-is: Tess.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-TessWind + if !flag(BuildExamples) + buildable: False + main-is: TessWind.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-TexBind + if !flag(BuildExamples) + buildable: False + main-is: TexBind.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-TexGen + if !flag(BuildExamples) + buildable: False + main-is: TexGen.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-TexProx + if !flag(BuildExamples) + buildable: False + main-is: TexProx.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-TexSub + if !flag(BuildExamples) + buildable: False + main-is: TexSub.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Texture3D + if !flag(BuildExamples) + buildable: False + main-is: Texture3D.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-TextureSurf + if !flag(BuildExamples) + buildable: False + main-is: TextureSurf.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Torus + if !flag(BuildExamples) + buildable: False + main-is: Torus.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Trim + if !flag(BuildExamples) + buildable: False + main-is: Trim.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-UnProject + if !flag(BuildExamples) + buildable: False + main-is: UnProject.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-VArray + if !flag(BuildExamples) + buildable: False + main-is: VArray.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook4-Wrap + if !flag(BuildExamples) + buildable: False + main-is: Wrap.hs + build-depends: base >= 3 && < 5, GLUT + hs-source-dirs: examples/RedBook4 + default-language: Haskell2010 + ghc-options: -Wall + +executable RedBook8-Triangles + if !flag(BuildExamples) + buildable: False + main-is: Triangles.hs + other-modules: LoadShaders + build-depends: base >= 3 && < 5, bytestring >= 0.9 && < 0.11, GLUT + hs-source-dirs: examples/RedBook8/Chapter01, examples/RedBook8/common + default-language: Haskell2010 + ghc-options: -Wall + source-repository head type: git location: https://github.com/haskell-opengl/GLUT.git diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GLUT-2.7.0.4/examples/BOGLGP/Chapter01/Makefile new/GLUT-2.7.0.5/examples/BOGLGP/Chapter01/Makefile --- old/GLUT-2.7.0.4/examples/BOGLGP/Chapter01/Makefile 2015-12-22 10:49:21.000000000 +0100 +++ new/GLUT-2.7.0.5/examples/BOGLGP/Chapter01/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -include ../../examples.mk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GLUT-2.7.0.4/examples/BOGLGP/Chapter02/Makefile new/GLUT-2.7.0.5/examples/BOGLGP/Chapter02/Makefile --- old/GLUT-2.7.0.4/examples/BOGLGP/Chapter02/Makefile 2015-12-22 10:49:21.000000000 +0100 +++ new/GLUT-2.7.0.5/examples/BOGLGP/Chapter02/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -include ../../examples.mk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GLUT-2.7.0.4/examples/BOGLGP/Chapter03/Makefile new/GLUT-2.7.0.5/examples/BOGLGP/Chapter03/Makefile --- old/GLUT-2.7.0.4/examples/BOGLGP/Chapter03/Makefile 2015-12-22 10:49:21.000000000 +0100 +++ new/GLUT-2.7.0.5/examples/BOGLGP/Chapter03/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -include ../../examples.mk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GLUT-2.7.0.4/examples/BOGLGP/Makefile new/GLUT-2.7.0.5/examples/BOGLGP/Makefile --- old/GLUT-2.7.0.4/examples/BOGLGP/Makefile 2015-12-22 10:49:21.000000000 +0100 +++ new/GLUT-2.7.0.5/examples/BOGLGP/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -SUBDIRS := $(wildcard Chapter*) -include ../examples.mk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GLUT-2.7.0.4/examples/Makefile new/GLUT-2.7.0.5/examples/Makefile --- old/GLUT-2.7.0.4/examples/Makefile 2015-12-22 10:49:21.000000000 +0100 +++ new/GLUT-2.7.0.5/examples/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -SUBDIRS := BOGLGP Misc OrangeBook RedBook4 RedBook8 -include examples.mk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GLUT-2.7.0.4/examples/Misc/ColorTriangle/Makefile new/GLUT-2.7.0.5/examples/Misc/ColorTriangle/Makefile --- old/GLUT-2.7.0.4/examples/Misc/ColorTriangle/Makefile 2015-12-22 10:49:21.000000000 +0100 +++ new/GLUT-2.7.0.5/examples/Misc/ColorTriangle/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -HC_SEARCH_PATHS := ../../RedBook8/common/ -include ../../examples.mk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GLUT-2.7.0.4/examples/Misc/Makefile new/GLUT-2.7.0.5/examples/Misc/Makefile --- old/GLUT-2.7.0.4/examples/Misc/Makefile 2015-12-22 10:49:21.000000000 +0100 +++ new/GLUT-2.7.0.5/examples/Misc/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -SUBDIRS := ColorTriangle -include ../examples.mk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GLUT-2.7.0.4/examples/Misc/SmoothOpenGL3.hs new/GLUT-2.7.0.5/examples/Misc/SmoothOpenGL3.hs --- old/GLUT-2.7.0.4/examples/Misc/SmoothOpenGL3.hs 2015-12-22 10:49:21.000000000 +0100 +++ new/GLUT-2.7.0.5/examples/Misc/SmoothOpenGL3.hs 2016-01-03 23:53:35.000000000 +0100 @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} {- SmoothOpenGL3.hs (adapted from freeglut's smooth_opengl3.c example) Copyright (c) Sven Panne 2009 <svenpanne(a)gmail.com> @@ -11,7 +12,13 @@ import Foreign.Marshal.Array import Foreign.Ptr import Foreign.Storable -import Graphics.Rendering.OpenGL.Raw.Core31 +#if MIN_VERSION_OpenGLRaw(3,0,0) +import Graphics.GL +#else +import Graphics.Rendering.OpenGL.Raw +#define GL_FALSE gl_FALSE +#define GL_TRUE gl_TRUE +#endif import Graphics.UI.GLUT import System.Exit import System.IO @@ -193,8 +200,8 @@ uniformMatrix4fv location count = glUniformMatrix4fv (uniformLocationToGLint location) count . marshalGLboolean where marshalGLboolean x = fromIntegral $ case x of - False -> gl_FALSE - True -> gl_TRUE + False -> GL_FALSE + True -> GL_TRUE -- MEGA HACK because UniformLocation is abstract uniformLocationToGLint = read . head . tail . words . show diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GLUT-2.7.0.4/examples/OrangeBook/Makefile new/GLUT-2.7.0.5/examples/OrangeBook/Makefile --- old/GLUT-2.7.0.4/examples/OrangeBook/Makefile 2015-12-22 10:49:21.000000000 +0100 +++ new/GLUT-2.7.0.5/examples/OrangeBook/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -SUBDIRS := ogl2brick -include ../examples.mk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GLUT-2.7.0.4/examples/OrangeBook/ogl2brick/Brick.hs new/GLUT-2.7.0.5/examples/OrangeBook/ogl2brick/Brick.hs --- old/GLUT-2.7.0.4/examples/OrangeBook/ogl2brick/Brick.hs 2015-12-22 10:49:21.000000000 +0100 +++ new/GLUT-2.7.0.5/examples/OrangeBook/ogl2brick/Brick.hs 2016-01-03 23:53:35.000000000 +0100 @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} {- Brick.hs (adapted from ogl2brick.c which is (c) 3Dlabs Inc. Ltd.) Copyright (c) Sven Panne 2006 <svenpanne(a)gmail.com> @@ -5,12 +6,14 @@ See the file libraries/GLUT/LICENSE -} +#if !MIN_VERSION_base(4,8,0) import Prelude hiding ( sum ) +import Data.Foldable ( Foldable, sum ) +#endif import Control.Applicative import Control.Exception ( IOException, catch ) import Control.Monad ( when, unless ) import qualified Data.ByteString as B -import Data.Foldable ( Foldable, sum ) import Data.IORef import System.Exit import Graphics.UI.GLUT @@ -321,9 +324,9 @@ currentProgram $= Just brickProg let setUniform var val = do - location <- get (uniformLocation brickProg var) - reportErrors - uniform location $= val + location <- get (uniformLocation brickProg var) + reportErrors + uniform location $= val setUniform "BrickColor" (Color3 1.0 0.3 (0.2 :: GLfloat)) setUniform "MortarColor" (Color3 0.85 0.86 (0.84 :: GLfloat)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GLUT-2.7.0.4/examples/OrangeBook/ogl2brick/Makefile new/GLUT-2.7.0.5/examples/OrangeBook/ogl2brick/Makefile --- old/GLUT-2.7.0.4/examples/OrangeBook/ogl2brick/Makefile 2015-12-22 10:49:21.000000000 +0100 +++ new/GLUT-2.7.0.5/examples/OrangeBook/ogl2brick/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -include ../../examples.mk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GLUT-2.7.0.4/examples/RedBook4/Makefile new/GLUT-2.7.0.5/examples/RedBook4/Makefile --- old/GLUT-2.7.0.4/examples/RedBook4/Makefile 2015-12-22 10:49:22.000000000 +0100 +++ new/GLUT-2.7.0.5/examples/RedBook4/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -EXCLUDED_SOURCES := ReadImage.hs -include ../examples.mk - -ColorMatrix ColorTable Convolution Histogram Minmax: ReadImage.o diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GLUT-2.7.0.4/examples/RedBook8/Chapter01/Makefile new/GLUT-2.7.0.5/examples/RedBook8/Chapter01/Makefile --- old/GLUT-2.7.0.4/examples/RedBook8/Chapter01/Makefile 2015-12-22 10:49:22.000000000 +0100 +++ new/GLUT-2.7.0.5/examples/RedBook8/Chapter01/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -HC_SEARCH_PATHS := ../common -include ../../examples.mk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GLUT-2.7.0.4/examples/RedBook8/Makefile new/GLUT-2.7.0.5/examples/RedBook8/Makefile --- old/GLUT-2.7.0.4/examples/RedBook8/Makefile 2015-12-22 10:49:22.000000000 +0100 +++ new/GLUT-2.7.0.5/examples/RedBook8/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -SUBDIRS := $(wildcard Chapter*) -include ../examples.mk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GLUT-2.7.0.4/examples/RedBook8/common/LoadShaders.hs new/GLUT-2.7.0.5/examples/RedBook8/common/LoadShaders.hs --- old/GLUT-2.7.0.4/examples/RedBook8/common/LoadShaders.hs 2015-12-22 10:49:22.000000000 +0100 +++ new/GLUT-2.7.0.5/examples/RedBook8/common/LoadShaders.hs 2016-01-03 23:53:35.000000000 +0100 @@ -20,7 +20,7 @@ import Control.Exception import Control.Monad import qualified Data.ByteString as B -import Graphics.Rendering.OpenGL +import Graphics.UI.GLUT -------------------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GLUT-2.7.0.4/examples/RedBook8/common/Makefile new/GLUT-2.7.0.5/examples/RedBook8/common/Makefile --- old/GLUT-2.7.0.4/examples/RedBook8/common/Makefile 2015-12-22 10:49:22.000000000 +0100 +++ new/GLUT-2.7.0.5/examples/RedBook8/common/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -include ../../examples.mk -HC := $(HC) -c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GLUT-2.7.0.4/examples/examples.mk new/GLUT-2.7.0.5/examples/examples.mk --- old/GLUT-2.7.0.4/examples/examples.mk 2015-12-22 10:49:22.000000000 +0100 +++ new/GLUT-2.7.0.5/examples/examples.mk 1970-01-01 01:00:00.000000000 +0100 @@ -1,37 +0,0 @@ -ALL_DIRS := $(SUBDIRS:%=all-%) -CLEAN_DIRS := $(SUBDIRS:%=clean-%) -HC := ghc -HC_FLAGS := -v0 -Wall -HC_PATH_FLAGS := $(HC_SEARCH_PATHS:%=-i%) -HS_SOURCES := $(wildcard *.hs) -HS_PROG_SOURCES := $(filter-out $(EXCLUDED_SOURCES), $(HS_SOURCES)) -HS_PROGS := $(HS_PROG_SOURCES:.hs=) - -.PHONY: all $(ALL_DIRS) all-common clean $(CLEAN_DIRS) foo - -all: $(ALL_DIRS) $(HS_PROGS) - -$(ALL_DIRS): all-common - $(MAKE) -C $(@:all-%=%) all - -all-common: -ifneq ($(wildcard common),) - $(MAKE) -C common all -endif - -clean: $(CLEAN_DIRS) -ifneq ($(wildcard common),) - $(MAKE) -C common clean -endif -ifneq ($(HS_SOURCES),) - $(RM) $(HS_SOURCES:.hs=.hi) $(HS_SOURCES:.hs=.o) $(HS_PROG_SOURCES:.hs=.exe) $(HS_PROGS) $(wildcard *~) -endif - -$(CLEAN_DIRS): - $(MAKE) -C $(@:clean-%=%) clean - -$(HS_PROGS): %: %.hs - $(HC) $(HC_FLAGS) $(HC_PATH_FLAGS) $(EXTRA_HC_FLAGS) $< - -%.o: %.hs - $(HC) $(HC_FLAGS) $(HC_PATH_FLAGS) $(EXTRA_HC_FLAGS) $< diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GLUT-2.7.0.4/src/Graphics/UI/GLUT/Colormap.hs new/GLUT-2.7.0.5/src/Graphics/UI/GLUT/Colormap.hs --- old/GLUT-2.7.0.4/src/Graphics/UI/GLUT/Colormap.hs 2015-12-22 10:49:21.000000000 +0100 +++ new/GLUT-2.7.0.5/src/Graphics/UI/GLUT/Colormap.hs 2016-01-03 23:53:35.000000000 +0100 @@ -45,7 +45,7 @@ import Data.StateVar ( GettableStateVar, makeGettableStateVar, StateVar, makeStateVar ) import Foreign.C.Types ( CInt ) import Graphics.Rendering.OpenGL.GL.VertexSpec ( Index1(..), Color3(..) ) -import Graphics.Rendering.OpenGL.Raw.Types ( GLint, GLfloat ) +import Graphics.Rendering.OpenGL ( GLint, GLfloat ) import Graphics.UI.GLUT.QueryUtils import Graphics.UI.GLUT.Raw diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GLUT-2.7.0.4/src/Graphics/UI/GLUT/Fonts.hs new/GLUT-2.7.0.5/src/Graphics/UI/GLUT/Fonts.hs --- old/GLUT-2.7.0.4/src/Graphics/UI/GLUT/Fonts.hs 2015-12-22 10:49:21.000000000 +0100 +++ new/GLUT-2.7.0.5/src/Graphics/UI/GLUT/Fonts.hs 2016-01-03 23:53:35.000000000 +0100 @@ -27,7 +27,7 @@ import Foreign.C.String ( withCString ) import Foreign.C.Types ( CInt ) import Foreign.Ptr ( castPtr ) -import Graphics.Rendering.OpenGL.Raw.Types ( GLint, GLfloat ) +import Graphics.Rendering.OpenGL ( GLint, GLfloat ) import Graphics.UI.GLUT.Raw diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GLUT-2.7.0.4/src/Graphics/UI/GLUT/GameMode.hs new/GLUT-2.7.0.5/src/Graphics/UI/GLUT/GameMode.hs --- old/GLUT-2.7.0.4/src/Graphics/UI/GLUT/GameMode.hs 2015-12-22 10:49:21.000000000 +0100 +++ new/GLUT-2.7.0.5/src/Graphics/UI/GLUT/GameMode.hs 2016-01-03 23:53:35.000000000 +0100 @@ -35,8 +35,7 @@ import Data.StateVar ( GettableStateVar, makeGettableStateVar , SettableStateVar, makeSettableStateVar ) import Foreign.C.String ( withCString ) -import Graphics.Rendering.OpenGL ( Size(..) ) -import Graphics.Rendering.OpenGL.Raw.Types ( GLenum ) +import Graphics.Rendering.OpenGL ( Size(..), GLenum ) import Graphics.UI.GLUT.Raw import Graphics.UI.GLUT.Types diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GLUT-2.7.0.4/src/Graphics/UI/GLUT/Objects.hs new/GLUT-2.7.0.5/src/Graphics/UI/GLUT/Objects.hs --- old/GLUT-2.7.0.4/src/Graphics/UI/GLUT/Objects.hs 2015-12-22 10:49:21.000000000 +0100 +++ new/GLUT-2.7.0.5/src/Graphics/UI/GLUT/Objects.hs 2016-01-03 23:53:35.000000000 +0100 @@ -41,8 +41,8 @@ import Foreign.C.Types ( CInt ) import Foreign.Marshal.Utils ( with ) import Foreign.Ptr ( Ptr, castPtr ) -import Graphics.Rendering.OpenGL ( Height, Radius, Slices, Stacks, Vertex3(..) ) -import Graphics.Rendering.OpenGL.Raw.Types ( GLdouble, GLint ) +import Graphics.Rendering.OpenGL ( + Height, Radius, Slices, Stacks, Vertex3(..), GLdouble, GLint ) import Graphics.UI.GLUT.Raw diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GLUT-2.7.0.4/src/Graphics/UI/GLUT/Overlay.hs new/GLUT-2.7.0.5/src/Graphics/UI/GLUT/Overlay.hs --- old/GLUT-2.7.0.4/src/Graphics/UI/GLUT/Overlay.hs 2015-12-22 10:49:21.000000000 +0100 +++ new/GLUT-2.7.0.5/src/Graphics/UI/GLUT/Overlay.hs 2016-01-03 23:53:35.000000000 +0100 @@ -34,7 +34,7 @@ import Data.StateVar ( GettableStateVar, makeGettableStateVar , SettableStateVar, makeSettableStateVar , StateVar, makeStateVar ) -import Graphics.Rendering.OpenGL.Raw.Types ( GLenum ) +import Graphics.Rendering.OpenGL ( GLenum ) import Graphics.UI.GLUT.QueryUtils import Graphics.UI.GLUT.Raw diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GLUT-2.7.0.4/src/Graphics/UI/GLUT/QueryUtils.hs new/GLUT-2.7.0.5/src/Graphics/UI/GLUT/QueryUtils.hs --- old/GLUT-2.7.0.4/src/Graphics/UI/GLUT/QueryUtils.hs 2015-12-22 10:49:21.000000000 +0100 +++ new/GLUT-2.7.0.5/src/Graphics/UI/GLUT/QueryUtils.hs 2016-01-03 23:53:35.000000000 +0100 @@ -18,7 +18,7 @@ ) where import Foreign.C.Types ( CInt ) -import Graphics.Rendering.OpenGL.Raw.Types ( GLenum ) +import Graphics.Rendering.OpenGL ( GLenum ) import Graphics.UI.GLUT.Raw diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GLUT-2.7.0.4/src/Graphics/UI/GLUT/Raw/Functions.hs new/GLUT-2.7.0.5/src/Graphics/UI/GLUT/Raw/Functions.hs --- old/GLUT-2.7.0.4/src/Graphics/UI/GLUT/Raw/Functions.hs 2015-12-22 10:49:21.000000000 +0100 +++ new/GLUT-2.7.0.5/src/Graphics/UI/GLUT/Raw/Functions.hs 2016-01-03 23:53:35.000000000 +0100 @@ -184,7 +184,7 @@ import Foreign.C.String ( withCString, CString ) import Foreign.Marshal.Error ( throwIf ) import Foreign.Ptr ( Ptr, FunPtr, nullFunPtr ) -import Graphics.Rendering.OpenGL.Raw.Types ( GLdouble, GLenum, GLfloat, GLint ) +import Graphics.Rendering.OpenGL ( GLdouble, GLenum, GLfloat, GLint ) import System.IO.Unsafe ( unsafePerformIO ) import Graphics.UI.GLUT.Raw.Callbacks @@ -1461,12 +1461,12 @@ -- glutSetMenuFont ------------------------------------------------------------- -glutSetMenuFont :: MonadIO m => GLint -> Ptr a -> m () +glutSetMenuFont :: MonadIO m => CInt -> Ptr a -> m () glutSetMenuFont v1 v2 = liftIO $ dyn_glutSetMenuFont ptr_glutSetMenuFont v1 v2 foreign import CALLCONV "dynamic" dyn_glutSetMenuFont - :: FunPtr (GLint -> Ptr a -> IO ()) - -> GLint -> Ptr a -> IO () + :: FunPtr (CInt -> Ptr a -> IO ()) + -> CInt -> Ptr a -> IO () {-# NOINLINE ptr_glutSetMenuFont #-} ptr_glutSetMenuFont :: FunPtr a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GLUT-2.7.0.4/src/Graphics/UI/GLUT/Raw/Tokens.hs new/GLUT-2.7.0.5/src/Graphics/UI/GLUT/Raw/Tokens.hs --- old/GLUT-2.7.0.4/src/Graphics/UI/GLUT/Raw/Tokens.hs 2015-12-22 10:49:21.000000000 +0100 +++ new/GLUT-2.7.0.5/src/Graphics/UI/GLUT/Raw/Tokens.hs 2016-01-03 23:53:35.000000000 +0100 @@ -16,7 +16,7 @@ module Graphics.UI.GLUT.Raw.Tokens where import Foreign.C.Types ( CInt, CUInt ) -import Graphics.Rendering.OpenGL.Raw.Types ( GLenum ) +import Graphics.Rendering.OpenGL ( GLenum ) glut_ACCUM :: CUInt glut_ACCUM = 0x0004 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GLUT-2.7.0.4/src/Graphics/UI/GLUT/State.hs new/GLUT-2.7.0.5/src/Graphics/UI/GLUT/State.hs --- old/GLUT-2.7.0.4/src/Graphics/UI/GLUT/State.hs 2015-12-22 10:49:21.000000000 +0100 +++ new/GLUT-2.7.0.5/src/Graphics/UI/GLUT/State.hs 2016-01-03 23:53:35.000000000 +0100 @@ -65,8 +65,7 @@ import Foreign.Marshal.Alloc ( alloca ) import Foreign.Marshal.Array ( peekArray ) import Foreign.Storable ( peek ) -import Graphics.Rendering.OpenGL ( AttribLocation(..), Size(..) ) -import Graphics.Rendering.OpenGL.Raw.Types ( GLenum, GLint ) +import Graphics.Rendering.OpenGL ( AttribLocation(..), Size(..), GLenum, GLint ) import Graphics.UI.GLUT.Overlay import Graphics.UI.GLUT.QueryUtils

1 0

commit ghc-OpenGL for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '16

05 Jan '16

Hello community, here is the log from the commit of package ghc-OpenGL for openSUSE:Factory checked in at 2016-01-05 21:55:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-OpenGL (Old) and /work/SRC/openSUSE:Factory/.ghc-OpenGL.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-OpenGL" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-OpenGL/ghc-OpenGL.changes 2015-12-29 12:58:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-OpenGL.new/ghc-OpenGL.changes 2016-01-05 21:55:52.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Jan 4 12:17:08 UTC 2016 - mimi.vx(a)gmail.com + +- update to 3.0.0.0 +* Depend on new OpenGLRaw and GLURaw packages + +------------------------------------------------------------------- Old: ---- OpenGL-2.13.2.1.tar.gz New: ---- OpenGL-3.0.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-OpenGL.spec ++++++ --- /var/tmp/diff_new_pack.m0mKMI/_old 2016-01-05 21:55:53.000000000 +0100 +++ /var/tmp/diff_new_pack.m0mKMI/_new 2016-01-05 21:55:53.000000000 +0100 @@ -19,7 +19,7 @@ %global pkg_name OpenGL Name: ghc-OpenGL -Version: 2.13.2.1 +Version: 3.0.0.0 Release: 0 Summary: A binding for the OpenGL graphics system License: BSD-3-Clause @@ -37,6 +37,7 @@ BuildRequires: ghc-OpenGLRaw-devel BuildRequires: ghc-StateVar-devel BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-containers-devel BuildRequires: ghc-text-devel BuildRequires: ghc-transformers-devel # End cabal-rpm deps ++++++ OpenGL-2.13.2.1.tar.gz -> OpenGL-3.0.0.0.tar.gz ++++++ ++++ 7909 lines of diff (skipped)

1 0

commit ghc-GLURaw for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '16

05 Jan '16

Hello community, here is the log from the commit of package ghc-GLURaw for openSUSE:Factory checked in at 2016-01-05 21:55:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-GLURaw (Old) and /work/SRC/openSUSE:Factory/.ghc-GLURaw.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-GLURaw" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-GLURaw/ghc-GLURaw.changes 2015-12-29 12:58:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-GLURaw.new/ghc-GLURaw.changes 2016-01-05 21:55:51.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Jan 4 12:03:25 UTC 2016 - mimi.vx(a)gmail.com + +- update to 2.0.0.0 +* Use pattern synonyms. +* Changed module name prefix from Graphics.Rendering.GLU.Raw to Graphics.GLU. + +------------------------------------------------------------------- Old: ---- GLURaw-1.5.0.3.tar.gz New: ---- GLURaw-2.0.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-GLURaw.spec ++++++ --- /var/tmp/diff_new_pack.TuuY97/_old 2016-01-05 21:55:52.000000000 +0100 +++ /var/tmp/diff_new_pack.TuuY97/_new 2016-01-05 21:55:52.000000000 +0100 @@ -18,7 +18,7 @@ %global pkg_name GLURaw Name: ghc-GLURaw -Version: 1.5.0.3 +Version: 2.0.0.0 Release: 0 Summary: A raw binding for the OpenGL graphics system License: BSD-3-Clause ++++++ GLURaw-1.5.0.3.tar.gz -> GLURaw-2.0.0.0.tar.gz ++++++ ++++ 3080 lines of diff (skipped)

1 0

commit ghc-OpenGLRaw for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '16

05 Jan '16

Hello community, here is the log from the commit of package ghc-OpenGLRaw for openSUSE:Factory checked in at 2016-01-05 21:55:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-OpenGLRaw (Old) and /work/SRC/openSUSE:Factory/.ghc-OpenGLRaw.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-OpenGLRaw" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-OpenGLRaw/ghc-OpenGLRaw.changes 2015-12-29 12:58:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-OpenGLRaw.new/ghc-OpenGLRaw.changes 2016-01-05 21:55:49.000000000 +0100 @@ -1,0 +2,20 @@ +Mon Jan 4 11:47:01 UTC 2016 - mimi.vx(a)gmail.com + +- update to 3.0.0.0 +* Make the OpenGLRaw package even more similar to the gl package: + + Use pattern synonyms for OpenGL enums. + + Changed module name prefix from Graphics.Rendering.OpenGL.Raw to Graphics.GL. + + Use slightly different type synonyms for GL type (introducing Fixed on + the way): + . CDouble => Double (for GLclampd, GLdouble) + . CFloat => Float (for GLclampf, GLfloat) + . CInt => Fixed (for GLclampx, GLfixed) + . CInt => Int32 (for GLint, GLsizei) + . CSChar => Int8 (for GLbyte) + . CShort => Int16 (for GLshort) + . CUChar => Word8 (for GLboolean, GLubyte) + . CUInt => Word32 (for GLbitfield, GLenum, GLhandleARB, GLuint) + . CUShort => Word16 (for GLushort) + + +------------------------------------------------------------------- Old: ---- OpenGLRaw-2.6.1.1.tar.gz New: ---- OpenGLRaw-3.0.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-OpenGLRaw.spec ++++++ --- /var/tmp/diff_new_pack.lXq08n/_old 2016-01-05 21:55:50.000000000 +0100 +++ /var/tmp/diff_new_pack.lXq08n/_new 2016-01-05 21:55:50.000000000 +0100 @@ -20,7 +20,7 @@ %global pkg_name OpenGLRaw Name: ghc-OpenGLRaw -Version: 2.6.1.1 +Version: 3.0.0.0 Release: 0 Summary: A raw binding for the OpenGL graphics system License: BSD-3-Clause @@ -37,6 +37,7 @@ BuildRequires: ghc-base-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel +BuildRequires: ghc-fixed-devel BuildRequires: ghc-half-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-text-devel ++++++ OpenGLRaw-2.6.1.1.tar.gz -> OpenGLRaw-3.0.0.0.tar.gz ++++++ ++++ 287888 lines of diff (skipped)

1 0

commit tlp for openSUSE:Factory
by root＠hilbert.suse.de 05 Jan '16

05 Jan '16

Hello community, here is the log from the commit of package tlp for openSUSE:Factory checked in at 2016-01-05 21:55:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tlp (Old) and /work/SRC/openSUSE:Factory/.tlp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tlp" Changes: -------- --- /work/SRC/openSUSE:Factory/tlp/tlp.changes 2015-08-07 00:25:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tlp.new/tlp.changes 2016-01-05 21:55:47.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Jan 4 12:08:37 UTC 2016 - sor.alexei(a)meowr.ru + +- Add tlp-0.8-correct-udev-rules-path.patch: set correct udev + rules path (boo#960498). + +------------------------------------------------------------------- New: ---- tlp-0.8-correct-udev-rules-path.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tlp.spec ++++++ --- /var/tmp/diff_new_pack.RzVyCt/_old 2016-01-05 21:55:48.000000000 +0100 +++ /var/tmp/diff_new_pack.RzVyCt/_new 2016-01-05 21:55:48.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package tlp # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,8 @@ Group: Hardware/Mobile Url: http://linrunner.de/tlp Source: https://github.com/linrunner/%{_name}/archive/%{version}.tar.gz#/%{name}-%{… +# PATCH-FIX-OPENSUSE tlp-0.8-correct-udev-rules-path.patch boo#960498 sor.alexei(a)meowr.ru -- Set correct udev rules path. +Patch0: %{name}-0.8-correct-udev-rules-path.patch BuildRequires: gzip BuildRequires: systemd-rpm-macros Requires: hdparm @@ -40,36 +42,43 @@ Recommends: smartmontools Suggests: acpi-call-kmp Suggests: tp-smapi-kmp -BuildArch: noarch Conflicts: laptop-mode-tools +BuildArch: noarch %{?systemd_requires} %description -TLP implements advanced power management for Linux. TLP is a pure -command line tool with automated background tasks. It does not -contain a GUI. +TLP implements advanced power management for Linux. +TLP is a pure command line tool with automated background tasks. +It does not contain a GUI. %package rdw -Summary: Radio Device Wizard +Summary: TLP Radio Device Wizard Group: Hardware/Mobile Requires: NetworkManager Requires: tlp = %{version} %description rdw +TLP implements advanced power management for Linux. +TLP is a pure command line tool with automated background tasks. +It does not contain a GUI. + Switch radios upon network connect/disconnect and dock/undock. %prep %setup -q -n %{_name}-%{version} +%patch0 -p1 %build -make %{?_smp_mflags} +make %{?_smp_mflags} \ + TLP_ULIB=%{_libexecdir}/udev \ + TLP_SYSD=%{_unitdir} %install %make_install \ TLP_WITH_SYSTEMD=1 \ TLP_NO_INIT=1 \ - TLP_SYSD=%{_unitdir} \ - TLP_ULIB=%{_libexecdir}/udev + TLP_ULIB=%{_libexecdir}/udev \ + TLP_SYSD=%{_unitdir} for num in 1 8; do mkdir -p %{buildroot}%{_mandir}/man$num/ ++++++ tlp-0.8-correct-udev-rules-path.patch ++++++ --- a/tlp-rdw.rules +++ b/tlp-rdw.rules @@ -6,22 +6,22 @@ # --- Dock/undock events # ThinkPad Advanced Mini Dock (and all older models), ThinkPad UltraBase -ACTION=="change", SUBSYSTEM=="platform", KERNEL=="dock.*", RUN+="/lib/udev/tlp-rdw-udev %p dock" +ACTION=="change", SUBSYSTEM=="platform", KERNEL=="dock.*", RUN+="/usr/lib/udev/tlp-rdw-udev %p dock" # ThinkPad Mini Dock (Plus) Series 3 -ACTION=="add|remove", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{PRODUCT}=="17ef/100a/*", RUN+="/lib/udev/tlp-rdw-udev %p usb_dock" +ACTION=="add|remove", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{PRODUCT}=="17ef/100a/*", RUN+="/usr/lib/udev/tlp-rdw-udev %p usb_dock" # ThinkPad Ultra Dock -ACTION=="add|remove", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{PRODUCT}=="17ef/1010/*", RUN+="/lib/udev/tlp-rdw-udev %p usb_dock" +ACTION=="add|remove", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{PRODUCT}=="17ef/1010/*", RUN+="/usr/lib/udev/tlp-rdw-udev %p usb_dock" # ThinkPad Pro Dock -ACTION=="add|remove", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{PRODUCT}=="17ef/1012/*", RUN+="/lib/udev/tlp-rdw-udev %p usb_dock" +ACTION=="add|remove", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{PRODUCT}=="17ef/1012/*", RUN+="/usr/lib/udev/tlp-rdw-udev %p usb_dock" # ThinkPad Basic Dock # *** TODO: yet unknown *** # ThinkPad OneLink Dock Pro -ACTION=="add|remove", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{PRODUCT}=="17ef/304b/*", RUN+="/lib/udev/tlp-rdw-udev %p usb_dock" +ACTION=="add|remove", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{PRODUCT}=="17ef/304b/*", RUN+="/usr/lib/udev/tlp-rdw-udev %p usb_dock" # ThinkPad OneLink Dock Basic -ACTION=="add|remove", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{PRODUCT}=="17ef/3049/*", RUN+="/lib/udev/tlp-rdw-udev %p usb_dock" +ACTION=="add|remove", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{PRODUCT}=="17ef/3049/*", RUN+="/usr/lib/udev/tlp-rdw-udev %p usb_dock" --- a/tlp.rules +++ b/tlp.rules @@ -7,4 +7,4 @@ ACTION=="change", SUBSYSTEM=="power_supply", ATTR{type}=="Mains", RUN+="/usr/sbin/tlp auto" # handle added usb devices (exclude subdevices via DRIVER=="USB") -ACTION=="add", SUBSYSTEM=="usb", DRIVER=="usb", ENV{DEVTYPE}=="usb_device", RUN+="/lib/udev/tlp-usb-udev %p" +ACTION=="add", SUBSYSTEM=="usb", DRIVER=="usb", ENV{DEVTYPE}=="usb_device", RUN+="/usr/lib/udev/tlp-usb-udev %p"

1 0