cfitsio ver. bump
This commit is contained in:
@@ -8,7 +8,7 @@ from pisi.actionsapi import autotools
|
|||||||
from pisi.actionsapi import pisitools
|
from pisi.actionsapi import pisitools
|
||||||
from pisi.actionsapi import get
|
from pisi.actionsapi import get
|
||||||
|
|
||||||
WorkDir = "cfitsio"
|
# WorkDir = "cfitsio"
|
||||||
|
|
||||||
def setup():
|
def setup():
|
||||||
autotools.autoreconf("-fi")
|
autotools.autoreconf("-fi")
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
diff -Nuar a/configure b/configure
|
||||||
|
--- a/configure 2023-07-24 05:59:25.000000000 +0300
|
||||||
|
+++ b/configure 2023-07-27 16:58:13.908936565 +0300
|
||||||
|
@@ -3994,7 +3994,7 @@
|
||||||
|
|
||||||
|
#-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
-LDFLAGS="$CFLAGS"
|
||||||
|
+# LDFLAGS="$CFLAGS"
|
||||||
|
LDFLAGS_BIN="$LDFLAGS"
|
||||||
|
|
||||||
|
if test "x$FC" = "xnone" ; then
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
diff -ur cfitsio-4.0.0/cfitsio.pc.in cfitsio-4.0.0.pc/cfitsio.pc.in
|
||||||
|
--- cfitsio-4.0.0/cfitsio.pc.in 2021-05-20 03:18:54.000000000 +0200
|
||||||
|
+++ cfitsio-4.0.0.pc/cfitsio.pc.in 2021-12-03 17:38:32.302407819 +0100
|
||||||
|
@@ -1,7 +1,7 @@
|
||||||
|
prefix=@prefix@
|
||||||
|
exec_prefix=@exec_prefix@
|
||||||
|
libdir=@libdir@
|
||||||
|
-includedir=@includedir@
|
||||||
|
+includedir=@includedir@/cfitsio
|
||||||
|
|
||||||
|
Name: cfitsio
|
||||||
|
Description: FITS File Subroutine Library
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
diff -ur cfitsio-4.2.0/configure cfitsio-4.2.0.rpath/configure
|
||||||
|
--- cfitsio-4.2.0/configure 2022-11-25 10:08:23.942637069 +0100
|
||||||
|
+++ cfitsio-4.2.0.rpath/configure 2022-11-25 10:10:13.213414398 +0100
|
||||||
|
@@ -5062,7 +5062,7 @@
|
||||||
|
printf "%s\n" "#define _FILE_OFFSET_BITS 64" >>confdefs.h
|
||||||
|
|
||||||
|
# LDFLAGS used by utilities:
|
||||||
|
- LDFLAGS_BIN="$LDFLAGS_BIN -Wl,-rpath,\${CFITSIO_LIB}"
|
||||||
|
+ LDFLAGS_BIN="$LDFLAGS_BIN"
|
||||||
|
;;
|
||||||
|
*mingw32*)
|
||||||
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for large file support" >&5
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
diff -ur cfitsio-3.47/Makefile.in cfitsio-3.47.zlib/Makefile.in
|
||||||
|
--- cfitsio-3.47/Makefile.in 2019-05-08 17:34:50.000000000 +0200
|
||||||
|
+++ cfitsio-3.47.zlib/Makefile.in 2019-08-01 15:52:57.829760351 +0200
|
||||||
|
@@ -103,7 +101,7 @@
|
||||||
|
shared: lib${PACKAGE}${SHLIB_SUFFIX}
|
||||||
|
|
||||||
|
lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS}
|
||||||
|
- ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS_CURL} ${LIBS}
|
||||||
|
+ ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm -lz -lbz2 ${LIBS_CURL} ${LIBS}
|
||||||
|
@if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \
|
||||||
|
ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \
|
||||||
|
ln -sf ${CFITSIO_SHLIB_SONAME} $@; \
|
||||||
|
@@ -140,28 +138,28 @@
|
||||||
|
${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $<
|
||||||
|
|
||||||
|
smem: smem.o lib${PACKAGE}.a ${OBJECTS}
|
||||||
|
- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm
|
||||||
|
+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz
|
||||||
|
|
||||||
|
testprog: testprog.o lib${PACKAGE}.a ${OBJECTS}
|
||||||
|
- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
|
||||||
|
+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
|
||||||
|
|
||||||
|
fpack: fpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
|
||||||
|
- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
|
||||||
|
+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS}
|
||||||
|
|
||||||
|
funpack: funpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
|
||||||
|
- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
|
||||||
|
+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS}
|
||||||
|
|
||||||
|
fitscopy: fitscopy.o lib${PACKAGE}.a ${OBJECTS}
|
||||||
|
- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
|
||||||
|
+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
|
||||||
|
|
||||||
|
speed: speed.o lib${PACKAGE}.a ${OBJECTS}
|
||||||
|
- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
|
||||||
|
+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
|
||||||
|
|
||||||
|
imcopy: imcopy.o lib${PACKAGE}.a ${OBJECTS}
|
||||||
|
- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
|
||||||
|
+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
|
||||||
|
|
||||||
|
cookbook: cookbook.o lib${PACKAGE}.a ${OBJECTS}
|
||||||
|
- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
|
||||||
|
+ ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
|
||||||
|
|
||||||
|
eval: # Rebuild eval_* files from flex/bison source
|
||||||
|
${FLEX} -t eval.l > eval_l.c1
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" ?>
|
<?xml version="1.0" ?>
|
||||||
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
<!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
||||||
<PISI>
|
<PISI>
|
||||||
<Source>
|
<Source>
|
||||||
<Name>cfitsio</Name>
|
<Name>cfitsio</Name>
|
||||||
@@ -13,11 +13,27 @@
|
|||||||
<IsA>app:console</IsA>
|
<IsA>app:console</IsA>
|
||||||
<Summary>C and Fortran library for manipulating FITS files</Summary>
|
<Summary>C and Fortran library for manipulating FITS files</Summary>
|
||||||
<Description>CFITSIO provides simple high-level routines for reading and writing FITS files that insulate the programmer from the internal complexities of the FITS format.</Description>
|
<Description>CFITSIO provides simple high-level routines for reading and writing FITS files that insulate the programmer from the internal complexities of the FITS format.</Description>
|
||||||
<Archive sha1sum="85b4adeba79a7691114695e6bafd6d968e68c21f" type="targz">http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio3450.tar.gz</Archive>
|
<Archive sha1sum="ccacad868712821c345da3313c3c83afb8efde1e" type="targz">https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-4.3.0.tar.gz</Archive>
|
||||||
|
<BuildDependencies>
|
||||||
|
<Dependency>bzip2</Dependency>
|
||||||
|
<Dependency>curl-devel</Dependency>
|
||||||
|
<Dependency>zlib-devel</Dependency>
|
||||||
|
</BuildDependencies>
|
||||||
|
<Patches>
|
||||||
|
<Patch level="1">fedora/cfitsio-ldflags.patch</Patch>
|
||||||
|
<Patch level="1">fedora/cfitsio-pkgconfig.patch</Patch>
|
||||||
|
<Patch level="1">fedora/cfitsio-remove-rpath.patch</Patch>
|
||||||
|
<Patch level="1">fedora/cfitsio-zlib.patch</Patch>
|
||||||
|
</Patches>
|
||||||
</Source>
|
</Source>
|
||||||
|
|
||||||
<Package>
|
<Package>
|
||||||
<Name>cfitsio</Name>
|
<Name>cfitsio</Name>
|
||||||
|
<RuntimeDependencies>
|
||||||
|
<Dependency>zlib</Dependency>
|
||||||
|
<Dependency>curl</Dependency>
|
||||||
|
<Dependency>bzip2</Dependency>
|
||||||
|
</RuntimeDependencies>
|
||||||
<Files>
|
<Files>
|
||||||
<Path fileType="library">/usr/lib</Path>
|
<Path fileType="library">/usr/lib</Path>
|
||||||
<Path fileType="executable">/usr/bin</Path>
|
<Path fileType="executable">/usr/bin</Path>
|
||||||
@@ -38,6 +54,13 @@
|
|||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="6">
|
||||||
|
<Date>2023-07-27</Date>
|
||||||
|
<Version>4.3.0</Version>
|
||||||
|
<Comment>Version bump.</Comment>
|
||||||
|
<Name>Mustafa Cinasal</Name>
|
||||||
|
<Email>muscnsl@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
<Update release="5">
|
<Update release="5">
|
||||||
<Date>2018-09-07</Date>
|
<Date>2018-09-07</Date>
|
||||||
<Version>3.450</Version>
|
<Version>3.450</Version>
|
||||||
|
|||||||
Reference in New Issue
Block a user