Compare commits
No commits in common. "rawhide" and "f16" have entirely different histories.
3 changed files with 54 additions and 197 deletions
|
|
@ -1,15 +0,0 @@
|
|||
diff -up amanith/plugins/png/gpngimpexp.cpp.pngfix amanith/plugins/png/gpngimpexp.cpp
|
||||
--- amanith/plugins/png/gpngimpexp.cpp.pngfix 2011-12-06 13:08:47.321866882 -0500
|
||||
+++ amanith/plugins/png/gpngimpexp.cpp 2011-12-06 13:09:30.297453723 -0500
|
||||
@@ -366,7 +366,11 @@ GError GPngImpExp::RawPngSave(const GCha
|
||||
/* Set error handling. REQUIRED if you aren't supplying your own
|
||||
* error handling functions in the png_create_write_struct() call.
|
||||
*/
|
||||
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
|
||||
+ if (setjmp(png_jmpbuf(png_ptr))) {
|
||||
+#else
|
||||
if (setjmp(png_ptr->jmpbuf)) {
|
||||
+#endif
|
||||
/* If we get here, we had a problem reading the file */
|
||||
std::fclose(fp);
|
||||
png_destroy_write_struct(&png_ptr, (png_infopp)info_ptr);
|
||||
|
|
@ -1,15 +1,38 @@
|
|||
diff -up amanith/amanith.pro.system amanith/amanith.pro
|
||||
--- amanith/amanith.pro.system 2005-12-06 05:43:12.000000000 -0500
|
||||
+++ amanith/amanith.pro 2011-12-06 13:13:16.310280875 -0500
|
||||
--- amanith/amanith.pro.BAD 2007-05-26 18:03:40.000000000 -0500
|
||||
+++ amanith/amanith.pro 2007-05-26 18:03:48.000000000 -0500
|
||||
@@ -1,4 +1,4 @@
|
||||
TEMPLATE = subdirs
|
||||
CONFIG += ordered
|
||||
|
||||
-SUBDIRS += 3rdpart build plugins examples
|
||||
+SUBDIRS += build plugins examples
|
||||
diff -up amanith/plugins/fonts/build.conf.system amanith/plugins/fonts/build.conf
|
||||
--- amanith/plugins/fonts/build.conf.system 2005-09-26 04:18:52.000000000 -0400
|
||||
+++ amanith/plugins/fonts/build.conf 2011-12-06 13:13:16.314280835 -0500
|
||||
--- amanith/plugins/jpeg/build.conf.BAD 2007-05-26 18:03:57.000000000 -0500
|
||||
+++ amanith/plugins/jpeg/build.conf 2007-05-26 18:04:09.000000000 -0500
|
||||
@@ -25,7 +25,7 @@ contains(DEFINES, _JPEG_PLUGIN) {
|
||||
}
|
||||
}
|
||||
|
||||
-unix: LIBS += $$(AMANITHDIR)/lib/libjpeg.a
|
||||
+unix: LIBS += -ljpeg
|
||||
win32: {
|
||||
|
||||
!contains(DEFINES, WIN32_MINGW) {
|
||||
--- amanith/plugins/png/build.conf.BAD 2007-05-26 18:04:21.000000000 -0500
|
||||
+++ amanith/plugins/png/build.conf 2007-05-26 18:04:33.000000000 -0500
|
||||
@@ -25,9 +25,7 @@ contains(DEFINES, _PNG_PLUGIN) {
|
||||
}
|
||||
}
|
||||
|
||||
-INCLUDEPATH += $$(AMANITHDIR)/3rdpart/zlib
|
||||
-
|
||||
-unix: LIBS += $$(AMANITHDIR)/lib/libpng.a $$(AMANITHDIR)/lib/libzlib.a
|
||||
+unix: LIBS += -lpng -lz
|
||||
win32: {
|
||||
|
||||
!contains(DEFINES, WIN32_MINGW) {
|
||||
diff -up amanith/plugins/fonts/build.conf.orig amanith/plugins/fonts/build.conf
|
||||
--- amanith/plugins/fonts/build.conf.orig 2005-09-26 04:18:52.000000000 -0400
|
||||
+++ amanith/plugins/fonts/build.conf 2008-09-26 15:52:14.000000000 -0400
|
||||
@@ -40,7 +40,7 @@ DEFINES -= FT_DEBUG_LEVEL_ERROR FT_DEBUG
|
||||
|
||||
INCLUDEPATH += $$(AMANITHDIR)/3rdpart/freetype2/include
|
||||
|
|
@ -19,39 +42,10 @@ diff -up amanith/plugins/fonts/build.conf.system amanith/plugins/fonts/build.con
|
|||
win32: {
|
||||
|
||||
!contains(DEFINES, WIN32_MINGW) {
|
||||
@@ -51,4 +51,4 @@ win32: {
|
||||
@@ -51,4 +51,4 @@ win32: {
|
||||
contains(DEFINES, WIN32_MINGW) {
|
||||
LIBS += $$(AMANITHDIR)/lib/libfreetype2.a $$(AMANITHDIR)/lib/libzlib.a
|
||||
}
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff -up amanith/plugins/jpeg/build.conf.system amanith/plugins/jpeg/build.conf
|
||||
--- amanith/plugins/jpeg/build.conf.system 2005-09-26 04:19:04.000000000 -0400
|
||||
+++ amanith/plugins/jpeg/build.conf 2011-12-06 13:13:16.311280865 -0500
|
||||
@@ -25,7 +25,7 @@ contains(DEFINES, _JPEG_PLUGIN) {
|
||||
}
|
||||
}
|
||||
|
||||
-unix: LIBS += $$(AMANITHDIR)/lib/libjpeg.a
|
||||
+unix: LIBS += -ljpeg
|
||||
win32: {
|
||||
|
||||
!contains(DEFINES, WIN32_MINGW) {
|
||||
diff -up amanith/plugins/png/build.conf.system amanith/plugins/png/build.conf
|
||||
--- amanith/plugins/png/build.conf.system 2005-09-26 04:19:14.000000000 -0400
|
||||
+++ amanith/plugins/png/build.conf 2011-12-06 13:14:28.079590898 -0500
|
||||
@@ -25,9 +25,10 @@ contains(DEFINES, _PNG_PLUGIN) {
|
||||
}
|
||||
}
|
||||
|
||||
-INCLUDEPATH += $$(AMANITHDIR)/3rdpart/zlib
|
||||
-
|
||||
-unix: LIBS += $$(AMANITHDIR)/lib/libpng.a $$(AMANITHDIR)/lib/libzlib.a
|
||||
+unix: {
|
||||
+ LIBS += `libpng-config --libs`
|
||||
+ LIBS += -lz
|
||||
+}
|
||||
win32: {
|
||||
|
||||
!contains(DEFINES, WIN32_MINGW) {
|
||||
|
|
|
|||
170
amanith.spec
170
amanith.spec
|
|
@ -1,18 +1,17 @@
|
|||
Name: amanith
|
||||
Version: 0.3
|
||||
Release: 59%{?dist}
|
||||
Release: 17%{?dist}
|
||||
Summary: Crossplatform framework for 2d/3d vector graphics
|
||||
# Automatically converted from old format: QPL - review is highly recommended.
|
||||
License: QPL-1.0
|
||||
Group: Development/Libraries
|
||||
License: QPL
|
||||
URL: http://www.amanith.org
|
||||
# Upstream no longer offers this code
|
||||
# It originally came from: http://www.amanith.org/download/files/amanith_03.tar.gz
|
||||
Source0: amanith_03.tar.gz
|
||||
BuildRequires: gcc-c++
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: qt3-devel, freetype-devel, libjpeg-devel, libpng-devel, zlib-devel
|
||||
BuildRequires: libXmu-devel, glew-devel, mesa-libGLU-devel
|
||||
BuildRequires: mesa-libGL-devel, pkgconfig
|
||||
BuildRequires: make
|
||||
Patch0: amanith-0.3-nothirdpartystatic.patch
|
||||
Patch1: amanith-0.3-system-glew.patch
|
||||
Patch3: amanith-0.3-gcc-C++fix.patch
|
||||
|
|
@ -24,7 +23,6 @@ Patch8: amanith-0.3-gcc43.patch
|
|||
Patch9: amanith-0.3-gcc44.patch
|
||||
Patch10: amanith-0.3-fix-DSO.patch
|
||||
Patch11: amanith-0.3-gcc-constructor-fix.patch
|
||||
Patch12: amanith-0.3-libpng15-fix.patch
|
||||
|
||||
%description
|
||||
Amanith is an OpenSource C++ CrossPlatform framework designed for 2d & 3d
|
||||
|
|
@ -33,6 +31,7 @@ system.
|
|||
|
||||
%package devel
|
||||
Summary: Development files for amanith
|
||||
Group: Development/Libraries
|
||||
Requires: glew-devel
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
|
|
@ -41,18 +40,17 @@ Development libraries and headers for developing programs that use amanith.
|
|||
|
||||
%prep
|
||||
%setup -q -n %{name}
|
||||
%patch -P0 -p1 -b .system
|
||||
%patch -P1 -p1
|
||||
%patch -P3 -p1
|
||||
%patch -P4 -p1
|
||||
%patch -P5 -p1
|
||||
%patch -P6 -p1
|
||||
%patch -P7 -p1
|
||||
%patch -P8 -p1
|
||||
%patch -P9 -p1
|
||||
%patch -P10 -p1 -b .DSO
|
||||
%patch -P11 -p1 -b .constructor
|
||||
%patch -P12 -p1 -b .pngfix
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%patch10 -p1 -b .DSO
|
||||
%patch11 -p1 -b .constructor
|
||||
# Boo. Hiss. SGI Free B and GLX files.
|
||||
rm -rf include/GL/
|
||||
# Don't need the 3rdpart stuff either.
|
||||
|
|
@ -91,144 +89,24 @@ cp -a lib/*.so* $RPM_BUILD_ROOT%{_libdir}
|
|||
cp -a plugins/*.so* $RPM_BUILD_ROOT%{_libdir}
|
||||
cp -a include/amanith $RPM_BUILD_ROOT%{_includedir}
|
||||
|
||||
%ldconfig_scriptlets
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc CHANGELOG FAQ LICENSE.QPL README doc/*
|
||||
%{_libdir}/*.so.*
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/*.so
|
||||
%{_includedir}/amanith/
|
||||
|
||||
%changelog
|
||||
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.3-59
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||
|
||||
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.3-58
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.3-57
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Wed Aug 07 2024 Miroslav Suchý <msuchy@redhat.com> - 0.3-56
|
||||
- convert license to SPDX
|
||||
|
||||
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.3-55
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.3-54
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.3-53
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.3-52
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.3-51
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.3-50
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Thu Feb 10 2022 Orion Poplawski <orion@nwra.com> - 0.3-49
|
||||
- Rebuild for glew 2.2
|
||||
|
||||
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.3-48
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.3-47
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.3-46
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Fri Jul 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.3-45
|
||||
- Second attempt - Rebuilt for
|
||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.3-44
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.3-43
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.3-42
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.3-41
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Thu Aug 23 2018 Nicolas Chauvet <kwizart@gmail.com> - 0.3-40
|
||||
- Rebuilt for glew 2.1.0
|
||||
|
||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.3-39
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.3-38
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.3-37
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.3-36
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.3-35
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Tue Jan 10 2017 Tom Callaway <spot@fedoraproject.org> - 0.3-34
|
||||
- rebuild for new GLEW
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.3-33
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Thu Jan 14 2016 Adam Jackson <ajax@redhat.com> - 0.3-32
|
||||
- Rebuild for glew 1.13
|
||||
|
||||
* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3-31
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 0.3-30
|
||||
- Rebuilt for GCC 5 C++11 ABI change
|
||||
|
||||
* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3-29
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3-28
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Mon Nov 18 2013 Dave Airlie <airlied@redhat.com> - 0.3-27
|
||||
- rebuilt for GLEW 1.10
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3-26
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3-25
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Fri Jan 18 2013 Adam Tkac <atkac redhat com> - 0.3-24
|
||||
- rebuild due to "jpeg8-ABI" feature drop
|
||||
|
||||
* Thu Dec 13 2012 Adam Jackson <ajax@redhat.com> - 0.3-23
|
||||
- Rebuild for glew 1.9.0
|
||||
|
||||
* Wed Aug 01 2012 Adam Jackson <ajax@redhat.com> - 0.3-22
|
||||
- -Rebuild for new glew
|
||||
|
||||
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3-21
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3-20
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Tue Dec 06 2011 Tom Callaway <spot@fedoraproject.org> - 0.3-19
|
||||
- fix code to use modern libpng
|
||||
|
||||
* Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 0.3-18
|
||||
- Rebuild for new libpng
|
||||
|
||||
* Wed Jun 29 2011 Tom Callaway <spot@fedoraproject.org> - 0.3-17
|
||||
- add missing default constructors
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue