[SOIL/f15] Initial import

belegdol belegdol at fedoraproject.org
Thu Jan 12 13:17:05 UTC 2012


commit afa8d7c0bb81adf22cb67759570e02287f01133f
Author: Julian Sikorski <belegdol at fedoraproject.org>
Date:   Thu Jan 12 14:14:54 2012 +0100

    Initial import

 .gitignore                |    1 +
 SOIL-link-correctly.patch |   11 +++++
 SOIL.spec                 |   91 +++++++++++++++++++++++++++++++++++++++++++++
 sources                   |    1 +
 4 files changed, 104 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..0397282 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/soil.zip
diff --git a/SOIL-link-correctly.patch b/SOIL-link-correctly.patch
new file mode 100644
index 0000000..170d726
--- /dev/null
+++ b/SOIL-link-correctly.patch
@@ -0,0 +1,11 @@
+--- SOIL-1.07/projects/makefile/alternate Makefile.txt.link-correctly	2008-07-07 18:13:28.000000000 +0200
++++ SOIL-1.07/projects/makefile/alternate Makefile.txt	2011-12-23 12:59:17.186345220 +0100
+@@ -29,7 +29,7 @@ lib: $(OFILES)
+ 	# create static library
+ 	ar -cvq $(LIBNAME).a $(OFILES)
+ 	# create shared library
+-	gcc -shared -Wl,-soname,$(LIBNAME).so.$(MAJOR) -o $(LIBNAME).so.$(VERSION) $(OFILES)
++	gcc -shared -Wl,-soname,$(LIBNAME).so.$(MAJOR) -o $(LIBNAME).so.$(VERSION) $(OFILES) -lGL -lm
+ 
+ install:
+ 	$(INSTALL_DIR) $(DESTDIR)/$(INCLUDEDIR)
diff --git a/SOIL.spec b/SOIL.spec
new file mode 100644
index 0000000..5b54469
--- /dev/null
+++ b/SOIL.spec
@@ -0,0 +1,91 @@
+Name:           SOIL
+Version:        1.07
+Release:        5.20080706%{?dist}
+Summary:        Simple OpenGL Image Library
+
+# src/image_helper.{c,h} are MIT-licensed
+License:        Publ1ic Domain and MIT
+URL:            http://www.lonesock.net/soil.html
+Source0:        http://www.lonesock.net/files/soil.zip
+Patch0:         %{name}-link-correctly.patch
+
+BuildRequires:  libGL-devel
+
+%description
+SOIL is a tiny C library used primarily for uploading textures into OpenGL. It
+is based on stb_image version 1.16, the public domain code from Sean Barrett.
+The author has extended it to load TGA and DDS files, and to perform common
+functions needed in loading OpenGL textures. SOIL can also be used to save and
+load images in a variety of formats (useful for loading height maps, non-OpenGL
+applications, etc.)
+
+%package        devel
+Summary:        Development files for %{name}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+%description    devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+
+%prep
+%setup -qc
+# workaround for RH bug #758824
+mv Simple\ OpenGL\ Image\ Library/* .
+rmdir Simple\ OpenGL\ Image\ Library
+%patch0 -p1 -b .link-correctly
+
+
+%build
+pushd src
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -c -fPIC" \
+    -f ../projects/makefile/alternate\ Makefile.txt
+popd
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+pushd src
+make -f ../projects/makefile/alternate\ Makefile.txt install \
+    DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} INCLUDEDIR=%{_includedir}/%{name} \
+    INSTALL_FILE="install -pm 644" INSTALL_DIR="install -dp"
+popd
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+
+# kill the static library
+rm -rf $RPM_BUILD_ROOT%{_libdir}/lib%{name}.a
+
+# fix the library permissions
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so.1.07-20071110
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
+%files
+%doc soil.html
+%{_libdir}/lib%{name}.so.*
+
+%files devel
+%{_includedir}/%{name}
+%{_libdir}/lib%{name}.so
+
+
+%changelog
+* Thu Jan 12 2012 Julian Sikorski <belegdol at fedoraproject.org> - 1.07-5.20080706
+- Fixed the License tag
+
+* Wed Jan 11 2012 Julian Sikorski <belegdol at fedoraproject.org> - 1.07-4.20080706
+- Use variables instead of sed to fix the makefile
+
+* Fri Dec 23 2011 Julian Sikorski <belegdol at fedoraproject.org> - 1.07-3.20080706
+- Ported a Debian patch ensuring the correct linking
+
+* Thu Dec 22 2011 Julian Sikorski <belegdol at fedoraproject.org> - 1.07-2.20080706
+- Renamed to SOIL
+
+* Wed Nov 30 2011 Julian Sikorski <belegdol at fedoraproject.org> - 1.07-1.20080706
+- Initial RPM release based on Debian package
+
diff --git a/sources b/sources
index e69de29..8c579d6 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+4736ac4f34fd9a41fa0197eac23bbc24  soil.zip


More information about the scm-commits mailing list