Compare commits
1 Commits
rawhide
...
epel8-play
Author | SHA1 | Date | |
---|---|---|---|
|
0d38094857 |
19
.gitignore
vendored
19
.gitignore
vendored
@ -1,19 +0,0 @@
|
||||
gdl-0.9rc4.tar.gz
|
||||
/gdl-0.9.tar.gz
|
||||
/gdl-0.9.1.tar.gz
|
||||
/gdl-0.9.2.tar.gz
|
||||
/gdl-0.9.3.tar.gz
|
||||
/gdl-0.9.4.tar.gz
|
||||
/gdl-0.9.5.tar.gz
|
||||
/gdl-0.9.6.tar.gz
|
||||
/gdl-0.9.6v2.tgz
|
||||
/gdl-0.9.7.tgz
|
||||
/gdl-0.9.8.tgz
|
||||
/gdl-0.9.8-git-f3b6e01.tar.gz
|
||||
/gdl-0.9.8-git-d892ee5.tar.gz
|
||||
/gdl-0.9.9.tar.gz
|
||||
/gdl-0.9.9-git-2870075.tar.gz
|
||||
/gdl-1.0.0-git-4892c96.tar.gz
|
||||
/gdl-1.0.0.tar.gz
|
||||
/gdl-1.0.1.tar.gz
|
||||
/gdl-1.0.2.tar.gz
|
174
1486.patch
174
1486.patch
@ -1,174 +0,0 @@
|
||||
From 6a3337ff29917a4766f80ffb19e24a55251f1511 Mon Sep 17 00:00:00 2001
|
||||
From: GillesDuvert <gilles.duvert@free.fr>
|
||||
Date: Fri, 20 Jan 2023 17:47:56 +0100
|
||||
Subject: [PATCH 1/2] try to permit distro builders to put drivers in
|
||||
GDL_LIB_DIR but still make normal (non-distro) build as usual and moreover
|
||||
enable relocation of gdl executable ans all its componenets, including
|
||||
drivers, as it is now done for installers on Windows and OSX.
|
||||
|
||||
---
|
||||
CMakeLists.txt | 1 +
|
||||
config.h.cmake | 1 +
|
||||
src/gdl.cpp | 24 +++++++++++++++++++-----
|
||||
src/objects.cpp | 2 ++
|
||||
src/objects.hpp | 2 ++
|
||||
5 files changed, 25 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index b0cecea36..281e12979 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -144,6 +144,7 @@ set(JPEGDIR "" CACHE PATH "GDL: Specify the JPEG directory tree")
|
||||
set(SZIPDIR "" CACHE PATH "GDL: Specify the SZip directory tree")
|
||||
|
||||
set(GDL_DATA_DIR "/share/gnudatalanguage" CACHE PATH "GDL: data directory relative to CMAKE_INSTALL_PREFIX")
|
||||
+set(GDL_LIB_DIR "" CACHE PATH "GDL: library directory relative to CMAKE_INSTALL_PREFIX")
|
||||
|
||||
# check for 64-bit OS
|
||||
if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
|
||||
diff --git a/config.h.cmake b/config.h.cmake
|
||||
index 07c7fa199..4637af869 100644
|
||||
--- a/config.h.cmake
|
||||
+++ b/config.h.cmake
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
#define EXEC_PREFIX "@CMAKE_INSTALL_PREFIX@"
|
||||
#define GDLDATADIR "@CMAKE_INSTALL_PREFIX@@GDL_DATA_DIR@"
|
||||
+#define GDLLIBDIR "@GDL_LIB_DIR@"
|
||||
#define VERSION "@VERSION@"
|
||||
|
||||
#define _CRT_SECURE_NO_WARNINGS
|
||||
diff --git a/src/gdl.cpp b/src/gdl.cpp
|
||||
index bf9947ae3..445145331 100644
|
||||
--- a/src/gdl.cpp
|
||||
+++ b/src/gdl.cpp
|
||||
@@ -250,8 +250,10 @@ int main(int argc, char *argv[])
|
||||
|
||||
//The default installation location --- will not always be there.
|
||||
gdlDataDir = std::string(GDLDATADIR);
|
||||
+ gdlLibDir = std::string(GDLLIBDIR);
|
||||
#ifdef _WIN32
|
||||
std::replace(gdlDataDir.begin(), gdlDataDir.end(), '/', '\\');
|
||||
+ std::replace(gdlLibDir.begin(), gdlLibDir.end(), '/', '\\');
|
||||
#endif
|
||||
|
||||
//check where is the executable being run
|
||||
@@ -269,16 +271,28 @@ int main(int argc, char *argv[])
|
||||
if( gdlPath == "") gdlPath=GetEnvString("IDL_PATH"); //warning: is a Path, use system separator.
|
||||
if( gdlPath == "") gdlPath = gdlDataDir + lib::PathSeparator() + "lib";
|
||||
|
||||
-//drivers if local
|
||||
+//LIBDIR. Can be '' in which case the location of drivers is deduced from the location of
|
||||
+//the executable (OSX, Windows, unix in user-installed mode).
|
||||
+ string driversPath = GetEnvPathString("GDL_DRV_DIR");
|
||||
+ if (driversPath == "") { //NOT enforced by GDL_DRV_DIR
|
||||
+ driversPath = gdlLibDir; //e.g. Fedora
|
||||
+ if (driversPath == "") { //NOT enforced by GDLLIBDIR at build : not a distro
|
||||
+ driversPath = gdlDataDir + lib::PathSeparator() + "drivers"; //deduced from the location of the executable
|
||||
+ }
|
||||
+ }
|
||||
+ //drivers if local
|
||||
useLocalDrivers=false;
|
||||
bool driversNotFound=false;
|
||||
- string driversPath=gdlDataDir + lib::PathSeparator() + "drivers";
|
||||
- //We'll ned to get the current value for PLPLOT_DRV_DIR if any (useful later if something goes wrong below)
|
||||
- static const char* DrvEnvName="PLPLOT_DRV_DIR";
|
||||
+
|
||||
+ //The current value for PLPLOT_DRV_DIR.
|
||||
+ //To find our drivers, the plplot library needs to have PLPLOT_DRV_DIR set to the good path, i.e., driversPath.
|
||||
+ const char* DrvEnvName = "PLPLOT_DRV_DIR";
|
||||
+ //In a startup message (below), the value of $PLPLOT_DRV_DIR appears.
|
||||
+ //It will be the value set inside the program (just below) to find the relevant drivers.
|
||||
|
||||
#ifdef INSTALL_LOCAL_DRIVERS
|
||||
useLocalDrivers=true;
|
||||
- //For WIN32 the drivers dlls are copied alongwith the gdl.exe and plplot does not use PLPLOT_DRV_DIR to find them.
|
||||
+ //For WIN32 the drivers dlls are copied along with the gdl.exe and plplot does not use PLPLOT_DRV_DIR to find them.
|
||||
#ifndef _WIN32
|
||||
char* oldDriverEnv=getenv(DrvEnvName);
|
||||
// We must declare here (and not later) where our local copy of (customized?) drivers is to be found.
|
||||
diff --git a/src/objects.cpp b/src/objects.cpp
|
||||
index d31991998..cc8d23088 100644
|
||||
--- a/src/objects.cpp
|
||||
+++ b/src/objects.cpp
|
||||
@@ -98,6 +98,8 @@ antlr::ASTFactory DNodeFactory("DNode",DNode::factory);
|
||||
|
||||
//this string contains the value of DATADIR
|
||||
std::string gdlDataDir;
|
||||
+//this string contains the value of LIBDIR
|
||||
+std::string gdlLibDir;
|
||||
//do we use WxWidgets at all?
|
||||
volatile bool useWxWidgets;
|
||||
//do we use WxWidgets for graphics?
|
||||
diff --git a/src/objects.hpp b/src/objects.hpp
|
||||
index e65059a11..7cde23877 100644
|
||||
--- a/src/objects.hpp
|
||||
+++ b/src/objects.hpp
|
||||
@@ -71,6 +71,8 @@ extern volatile bool sigControlC;
|
||||
|
||||
//this string contains the value of DATADIR
|
||||
extern std::string gdlDataDir;
|
||||
+//this string contains the value of LIBDIR
|
||||
+extern std::string gdlLibDir;
|
||||
|
||||
extern volatile bool iAmANotebook;
|
||||
// tells if wxwidgets is to be used at all...
|
||||
|
||||
From 7688f0b931d03d7ff15e552dac3666ebd819cd82 Mon Sep 17 00:00:00 2001
|
||||
From: GillesDuvert <gilles.duvert@free.fr>
|
||||
Date: Sat, 21 Jan 2023 19:56:56 +0100
|
||||
Subject: [PATCH 2/2] enable GDL_LIB_DIR positioning of .so files (drivers),
|
||||
something needed by distributions (Debian, Fedora...)
|
||||
|
||||
---
|
||||
CMakeLists.txt | 8 +++++++-
|
||||
config.h.cmake | 1 +
|
||||
src/plplotdriver/CMakeLists.txt | 4 ++--
|
||||
3 files changed, 10 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 281e12979..5c674e141 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -145,7 +145,13 @@ set(SZIPDIR "" CACHE PATH "GDL: Specify the SZip directory tree")
|
||||
|
||||
set(GDL_DATA_DIR "/share/gnudatalanguage" CACHE PATH "GDL: data directory relative to CMAKE_INSTALL_PREFIX")
|
||||
set(GDL_LIB_DIR "" CACHE PATH "GDL: library directory relative to CMAKE_INSTALL_PREFIX")
|
||||
-
|
||||
+#define (for plplotdriver/CMakeLists.txt) the GDL_DRV_DIR where the drivers will be installed.
|
||||
+#if GDL_LIB_DIR is empty, it will be the default (GDL_DATA_DIR/drivers) otherwise it is GDL_LIB_DIR (not GDL_LIB_DIR/drivers)
|
||||
+if ( GDL_LIB_DIR STREQUAL "" OR NOT GDL_LIB_DIR)
|
||||
+ set (GDL_DRV_DIR "${CMAKE_INSTALL_PREFIX}/${GDL_DATA_DIR}/drivers") # CACHE PATH "GDL: where the drivers will be installed.")
|
||||
+else()
|
||||
+ set (GDL_DRV_DIR "${GDL_LIB_DIR}" ) # CACHE PATH "GDL: where the drivers will be installed.")
|
||||
+endif()
|
||||
# check for 64-bit OS
|
||||
if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
|
||||
set(HAVE_64BIT_OS 1)
|
||||
diff --git a/config.h.cmake b/config.h.cmake
|
||||
index 4637af869..7080df9a6 100644
|
||||
--- a/config.h.cmake
|
||||
+++ b/config.h.cmake
|
||||
@@ -4,6 +4,7 @@
|
||||
#define EXEC_PREFIX "@CMAKE_INSTALL_PREFIX@"
|
||||
#define GDLDATADIR "@CMAKE_INSTALL_PREFIX@@GDL_DATA_DIR@"
|
||||
#define GDLLIBDIR "@GDL_LIB_DIR@"
|
||||
+#define GDL_DRV_DIR "@GDL_DRV_DIR@"
|
||||
#define VERSION "@VERSION@"
|
||||
|
||||
#define _CRT_SECURE_NO_WARNINGS
|
||||
diff --git a/src/plplotdriver/CMakeLists.txt b/src/plplotdriver/CMakeLists.txt
|
||||
index 69e5062b1..a48742c10 100644
|
||||
--- a/src/plplotdriver/CMakeLists.txt
|
||||
+++ b/src/plplotdriver/CMakeLists.txt
|
||||
@@ -66,8 +66,8 @@ if(INSTALL_LOCAL_DRIVERS)
|
||||
|
||||
foreach(v IN LISTS WHAT)
|
||||
set_target_properties(${v} PROPERTIES PREFIX "" SUFFIX ${DYNAMIC_SUFFIX} )
|
||||
- install(TARGETS ${v} DESTINATION ${CMAKE_INSTALL_PREFIX}/${GDL_DATA_DIR}/drivers)
|
||||
- install( FILES ${v}.driver_info DESTINATION ${CMAKE_INSTALL_PREFIX}/${GDL_DATA_DIR}/drivers)
|
||||
+ install(TARGETS ${v} DESTINATION ${GDL_DRV_DIR})
|
||||
+ install( FILES ${v}.driver_info DESTINATION ${GDL_DRV_DIR})
|
||||
endforeach()
|
||||
|
||||
endif(INSTALL_LOCAL_DRIVERS)
|
1
dead.package
Normal file
1
dead.package
Normal file
@ -0,0 +1 @@
|
||||
epel8-playground decommissioned : https://pagure.io/epel/issue/136
|
@ -1,22 +0,0 @@
|
||||
diff -up gdl-1.0.2/src/CMakeLists.txt.antlr gdl-1.0.2/src/CMakeLists.txt
|
||||
--- gdl-1.0.2/src/CMakeLists.txt.antlr 2023-01-06 10:39:47.000000000 -0700
|
||||
+++ gdl-1.0.2/src/CMakeLists.txt 2023-01-16 08:51:18.033486027 -0700
|
||||
@@ -197,9 +197,7 @@ endif(HAVE_LIBWXWIDGETS AND WIN32)
|
||||
#local plplot drivers
|
||||
add_subdirectory(plplotdriver)
|
||||
|
||||
-add_subdirectory(antlr)
|
||||
-
|
||||
-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/antlr ${CMAKE_SOURCE_DIR}/src/plplotdriver ${CMAKE_BINARY_DIR})
|
||||
+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/plplotdriver ${CMAKE_BINARY_DIR})
|
||||
link_directories(${LINK_DIRECTORIES})
|
||||
|
||||
if(PYTHON_MODULE) #GDL.so
|
||||
@@ -217,7 +215,6 @@ if(USE_OPENMP)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
|
||||
endif(USE_OPENMP)
|
||||
|
||||
-add_dependencies(gdl antlr) # be sure that antlr is built before gdl
|
||||
target_link_libraries(gdl antlr) # link antlr against gdl
|
||||
if (MINGW)
|
||||
target_link_libraries(gdl ws2_32)
|
@ -1,58 +0,0 @@
|
||||
diff -up gdl-1.0.2/src/qhull.cpp.size gdl-1.0.2/src/qhull.cpp
|
||||
--- gdl-1.0.2/src/qhull.cpp.size 2023-01-06 10:39:47.000000000 -0700
|
||||
+++ gdl-1.0.2/src/qhull.cpp 2023-01-16 19:35:16.464432434 -0700
|
||||
@@ -784,7 +784,7 @@ int output_qhull_voronoi_local(Qhull* qh
|
||||
func = e->GetParAs<DDoubleGDL>(3); //input function
|
||||
tetra_list = e->GetParAs<DLongGDL>(4); //indices of tetrahedra vertices from qhull
|
||||
|
||||
- int inDim = e->GetParAs<DDoubleGDL>(0)->Dim(0);
|
||||
+ SizeT inDim = e->GetParAs<DDoubleGDL>(0)->Dim(0);
|
||||
p0 = new DDoubleGDL( *(new dimension(3, inDim)), BaseGDL::ZERO ); //concatenation of the 3 separate inputs arrays
|
||||
|
||||
for(int i=0; i<3; i++)
|
||||
@@ -794,7 +794,7 @@ int output_qhull_voronoi_local(Qhull* qh
|
||||
{
|
||||
e->Throw("separated input arrays must have same length and be 1 dimensional");
|
||||
}
|
||||
- for(int j=0; j<inDim; j++) (*p0)[i+j*3] = (*par)[j];
|
||||
+ for(SizeT j=0; j<inDim; j++) (*p0)[i+j*3] = (*par)[j];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -819,9 +819,9 @@ int output_qhull_voronoi_local(Qhull* qh
|
||||
|
||||
// putting input points in a vector...
|
||||
vector<Vec3> points;
|
||||
- points.reserve(np);
|
||||
+ points.resize(np);
|
||||
|
||||
- for (int i =0; i < np; i++)
|
||||
+ for (size_t i =0; i < np; i++)
|
||||
{
|
||||
points[i] = { (*p0)[3*i], (*p0)[3*i+1], (*p0)[3*i+2] };
|
||||
//TODO handle not finite values
|
||||
@@ -829,7 +829,7 @@ int output_qhull_voronoi_local(Qhull* qh
|
||||
|
||||
// vector holding all necessary info on the triangulation
|
||||
vector<Tetra> tetra_data;
|
||||
- tetra_data.reserve(n_tetra);
|
||||
+ tetra_data.resize(n_tetra);
|
||||
|
||||
// directly available info
|
||||
array<int,4> empty_neighbours {-1,-1,-1,-1};
|
||||
@@ -848,7 +848,7 @@ int output_qhull_voronoi_local(Qhull* qh
|
||||
// TOO SLOW, FIND ANOTHER METHOD
|
||||
|
||||
vector<int> tetra_neigh_count(n_tetra, 0);
|
||||
- tetra_neigh_count.reserve(n_tetra);
|
||||
+ tetra_neigh_count.resize(n_tetra);
|
||||
|
||||
for(int i=0; i<n_tetra; ++i)
|
||||
{
|
||||
@@ -1062,4 +1062,4 @@ int output_qhull_voronoi_local(Qhull* qh
|
||||
|
||||
return res;
|
||||
}
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
5
gdl.csh
5
gdl.csh
@ -1,5 +0,0 @@
|
||||
# Make sure GDL_PATH is set
|
||||
if ( $?GDL_PATH ) then
|
||||
exit
|
||||
endif
|
||||
setenv GDL_PATH +/usr/share/gnudatalanguage
|
3
gdl.sh
3
gdl.sh
@ -1,3 +0,0 @@
|
||||
# Make sure GDL_PATH is set
|
||||
[ -z "$GDL_PATH" ] && GDL_PATH="+/usr/share/gnudatalanguage"
|
||||
export GDL_PATH
|
845
gdl.spec
845
gdl.spec
@ -1,845 +0,0 @@
|
||||
%global commit 4892c96996d23a77c153737ace2d1f171938f560
|
||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||
%global __cmake_in_source_build 1
|
||||
|
||||
%bcond_without java
|
||||
|
||||
# No more Java on i686
|
||||
ExcludeArch: %{ix86}
|
||||
|
||||
|
||||
Name: gdl
|
||||
Version: 1.0.2
|
||||
Release: 1%{?dist}
|
||||
Summary: GNU Data Language
|
||||
|
||||
License: GPL-2.0-or-later
|
||||
URL: http://gnudatalanguage.sourceforge.net/
|
||||
Source0: https://github.com/gnudatalanguage/gdl/archive/v%{version}/gdl-%{version}.tar.gz
|
||||
#Source0: https://github.com/gnudatalanguage/gdl/archive/%{commit}/gdl-%{version}-git-%{shortcommit}.tar.gz
|
||||
Source1: gdl.csh
|
||||
Source2: gdl.sh
|
||||
Source4: xorg.conf
|
||||
# Build with system antlr library. Request for upstream change here:
|
||||
# https://sourceforge.net/tracker/index.php?func=detail&aid=2685215&group_id=97659&atid=618686
|
||||
Patch1: gdl-antlr.patch
|
||||
# Fix install directory for drivers
|
||||
Patch2: https://patch-diff.githubusercontent.com/raw/gnudatalanguage/gdl/pull/1486.patch
|
||||
Patch3: gdl-size.patch
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: antlr-C++
|
||||
BuildRequires: antlr-tool
|
||||
%if %{with java}
|
||||
BuildRequires: java-devel
|
||||
%endif
|
||||
BuildRequires: eigen3-static
|
||||
BuildRequires: expat-devel
|
||||
BuildRequires: fftw-devel
|
||||
BuildRequires: glpk-devel
|
||||
BuildRequires: GraphicsMagick-c++-devel
|
||||
BuildRequires: gsl-devel
|
||||
BuildRequires: hdf-static
|
||||
BuildRequires: hdf5-devel
|
||||
BuildRequires: libgeotiff-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libtiff-devel
|
||||
BuildRequires: libtirpc-devel
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: netcdf-devel
|
||||
BuildRequires: plplot-wxGTK-devel >= 5.11
|
||||
BuildRequires: proj-devel
|
||||
BuildRequires: pslib-devel
|
||||
BuildRequires: python%{python3_pkgversion}-devel
|
||||
BuildRequires: python%{python3_pkgversion}-numpy
|
||||
BuildRequires: python%{python3_pkgversion}-matplotlib
|
||||
BuildRequires: readline-devel
|
||||
# Not yet possible to build with external dSFMT
|
||||
#BuildRequires: dSFMT-devel
|
||||
Provides: bundled(dSFMT)
|
||||
BuildRequires: shapelib-devel
|
||||
# eccodes not available on these arches
|
||||
%ifnarch i686 s390x armv7hl
|
||||
BuildRequires: eccodes-devel
|
||||
%else
|
||||
BuildRequires: grib_api-devel
|
||||
%endif
|
||||
#TODO - Build with mpi support
|
||||
#BuildRequires: mpich2-devel
|
||||
BuildRequires: qhull-devel
|
||||
BuildRequires: udunits2-devel
|
||||
BuildRequires: wxGTK-devel
|
||||
BuildRequires: cmake3
|
||||
# For tests
|
||||
# EL8 s390x missing xorg-x11-drv-dummy
|
||||
%if ! ( 0%{?rhel} >= 8 && "%{_arch}" == "s390x" )
|
||||
BuildRequires: xorg-x11-drv-dummy
|
||||
BuildRequires: metacity
|
||||
%endif
|
||||
BuildRequires: make
|
||||
# Needed to pull in drivers
|
||||
Requires: plplot
|
||||
# Widgets use wx
|
||||
Recommends: plplot-wxGTK
|
||||
Requires: %{name}-common = %{version}-%{release}
|
||||
Provides: %{name}-runtime = %{version}-%{release}
|
||||
# Need to match hdf5 compile time version
|
||||
Requires: hdf5 = %{_hdf5_version}
|
||||
|
||||
|
||||
%description
|
||||
A free IDL (Interactive Data Language) compatible incremental compiler
|
||||
(i.e. runs IDL programs). IDL is a registered trademark of Research
|
||||
Systems Inc.
|
||||
|
||||
|
||||
%package common
|
||||
Summary: Common files for GDL
|
||||
Requires: %{name}-runtime = %{version}-%{release}
|
||||
BuildArch: noarch
|
||||
|
||||
%description common
|
||||
Common files for GDL
|
||||
|
||||
|
||||
%package -n python%{python3_pkgversion}-gdl
|
||||
%{?python_provide:%python_provide python%{python3_pkgversion}-gdl}
|
||||
# Remove before F30
|
||||
Provides: %{name}-python = %{version}-%{release}
|
||||
Provides: %{name}-python%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: %{name}-python < %{version}-%{release}
|
||||
Summary: GDL python module
|
||||
# Needed to pull in drivers
|
||||
Requires: plplot
|
||||
Requires: %{name}-common = %{version}-%{release}
|
||||
Provides: %{name}-runtime = %{version}-%{release}
|
||||
|
||||
%description -n python%{python3_pkgversion}-gdl
|
||||
%{summary}.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n gdl-%{version}
|
||||
rm -rf src/antlr
|
||||
# Not yet possible to build with external dSFMT
|
||||
#rm -r src/dSFMT
|
||||
%patch1 -p1 -b .antlr
|
||||
%patch2 -p1 -b .libdir
|
||||
%patch3 -p1 -b .size
|
||||
|
||||
# Find grib_api on architectures where needed
|
||||
sed -i -e '/find_library(GRIB_LIBRARIES/s/eccodes/eccodes grib_api/' CMakeModules/FindGrib.cmake
|
||||
|
||||
pushd src
|
||||
for f in *.g
|
||||
do
|
||||
antlr $f
|
||||
done
|
||||
popd
|
||||
|
||||
%global __python %{__python3}
|
||||
%global python_sitearch %{python3_sitearch}
|
||||
%global cmake_opts \\\
|
||||
-DGDL_LIB_DIR:PATH=%{_libdir}/gnudatalanguage \\\
|
||||
-DGEOTIFF_INCLUDE_DIR=%{_includedir}/libgeotiff \\\
|
||||
-DGRIB=ON \\\
|
||||
-DOPENMP=ON \\\
|
||||
-DPYTHON_EXECUTABLE=%{__python} \\\
|
||||
-DWXWIDGETS=ON \\\
|
||||
%{?cmake_qhull} \\\
|
||||
%{nil}
|
||||
# TODO - build an mpi version
|
||||
# INCLUDES="-I/usr/include/mpich2" \
|
||||
# --with-mpich=%{_libdir}/mpich2 \
|
||||
|
||||
%build
|
||||
export CXXFLAGS="%optflags -fcommon"
|
||||
%ifarch %{arm}
|
||||
# Work around https://github.com/gnudatalanguage/gdl/issues/677
|
||||
export LDFLAGS="%{build_ldflags} -Wl,--allow-multiple-definition"
|
||||
%endif
|
||||
mkdir build build-python
|
||||
#Build the standalone executable
|
||||
pushd build
|
||||
%cmake3 %{cmake_opts} ..
|
||||
make #{?_smp_mflags}
|
||||
popd
|
||||
#Build the python module
|
||||
pushd build-python
|
||||
%cmake3 %{cmake_opts} -DPYTHON_MODULE=ON ..
|
||||
make #{?_smp_mflags}
|
||||
popd
|
||||
|
||||
|
||||
%install
|
||||
pushd build
|
||||
%make_install
|
||||
popd
|
||||
pushd build-python
|
||||
%make_install
|
||||
# Install the python module in the right location
|
||||
install -d -m 0755 $RPM_BUILD_ROOT%{python_sitearch}
|
||||
%if "%{_lib}" != "lib"
|
||||
mv $RPM_BUILD_ROOT%{_prefix}/lib/python*/site-packages/GDL.so \
|
||||
$RPM_BUILD_ROOT%{python_sitearch}/GDL.so
|
||||
%endif
|
||||
popd
|
||||
|
||||
# Install the profile file to set GDL_PATH
|
||||
install -d -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
|
||||
install -m 0644 %SOURCE1 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
|
||||
install -m 0644 %SOURCE2 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
|
||||
|
||||
|
||||
# EL8 s390x missing xorg-x11-drv-dummy
|
||||
%if ! ( 0%{?rhel} >= 8 && "%{_arch}" == "s390x" )
|
||||
%check
|
||||
export GDL_DRV_DIR=$RPM_BUILD_ROOT%{_libdir}/gnudatalanguage
|
||||
cd build
|
||||
cp %SOURCE4 .
|
||||
if [ -x /usr/libexec/Xorg ]; then
|
||||
Xorg=/usr/libexec/Xorg
|
||||
elif [ -x /usr/libexec/Xorg.bin ]; then
|
||||
Xorg=/usr/libexec/Xorg.bin
|
||||
else
|
||||
# Strip suid root
|
||||
cp /usr/bin/Xorg .
|
||||
Xorg=./Xorg
|
||||
fi
|
||||
$Xorg -noreset +extension GLX +extension RANDR +extension RENDER -logfile ./xorg.log -config ./xorg.conf -configdir . :99 &
|
||||
export DISPLAY=:99
|
||||
|
||||
metacity &
|
||||
sleep 2
|
||||
# byte_conversion/bytscl - https://github.com/gnudatalanguage/gdl/issues/1079
|
||||
# test_l64 - https://github.com/gnudatalanguage/gdl/issues/1075
|
||||
%ifarch aarch64
|
||||
failing_tests="test_(byte_conversion|bytscl)"
|
||||
%endif
|
||||
%ifarch %{arm}
|
||||
failing_tests="test_(byte_conversion|bytscl|l64)"
|
||||
%endif
|
||||
%ifarch %{ix86}
|
||||
failing_tests="test_l64"
|
||||
%endif
|
||||
%ifarch ppc64le
|
||||
failing_tests="test_(byte_conversion|bytscl|finite|matrix_multiply)"
|
||||
%endif
|
||||
%ifarch s390x
|
||||
# test_hdf5 - https://github.com/gnudatalanguage/gdl/issues/1488
|
||||
failing_tests="test_(byte_conversion|bytsc|hdf5)"
|
||||
%endif
|
||||
make test VERBOSE=1 ARGS="-V -E '$failing_tests'"
|
||||
make test VERBOSE=1 ARGS="-V -R '$failing_tests' --timeout 600" || :
|
||||
kill %1 || :
|
||||
cat xorg.log
|
||||
%endif
|
||||
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
%doc AUTHORS HACKING NEWS README
|
||||
%config(noreplace) %{_sysconfdir}/profile.d/gdl.*sh
|
||||
%{_bindir}/gdl
|
||||
%{_libdir}/gnudatalanguage/
|
||||
%{_mandir}/man1/gdl.1*
|
||||
|
||||
%files common
|
||||
%{_datadir}/gnudatalanguage/
|
||||
|
||||
%files -n python%{python3_pkgversion}-gdl
|
||||
%{python_sitearch}/GDL.so
|
||||
|
||||
|
||||
%changelog
|
||||
* Sun Jan 22 2023 Orion Poplawski <orion@nwra.com> - 1.0.2-1
|
||||
- Update to 1.0.2
|
||||
- Use SPDX License tag
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Tue Nov 15 2022 Scott Talbert <swt@techie.net> - 1.0.1-11
|
||||
- Rebuild with wxWidgets 3.2
|
||||
|
||||
* Sat Nov 05 2022 Orion Poplawski <orion@nwra.com> - 1.0.1-10
|
||||
- Re-enable LTO on ppc64le
|
||||
|
||||
* Tue Aug 23 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.0.1-9
|
||||
- Rebuild for gsl-2.7.1
|
||||
|
||||
% Thu Jul 21 2022 Orion Poplawski <orion@nwra.com> - 1.0.1-8
|
||||
- Drop i686 completely - no antlr support
|
||||
|
||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Sun Jul 10 2022 Orion Poplawski <orion@nwra.com> - 1.0.1-7
|
||||
- Drop java for i686 (bz#2104042)
|
||||
|
||||
* Wed Jun 15 2022 Python Maint <python-maint@redhat.com> - 1.0.1-6
|
||||
- Rebuilt for Python 3.11
|
||||
|
||||
* Thu Mar 10 2022 Sandro Mani <manisandro@gmail.com> - 1.0.1-5
|
||||
- Rebuild for proj-9.0.0
|
||||
|
||||
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.0.1-4
|
||||
- Rebuilt for java-17-openjdk as system jdk
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Mon Nov 22 2021 Orion Poplawski <orion@nwra.com> - 1.0.1-2
|
||||
- Rebuild for hdf5 1.12.1
|
||||
|
||||
* Mon Oct 18 2021 Orion Poplawski <orion@nwra.com> - 1.0.1-1
|
||||
- Update to 1.0.1
|
||||
|
||||
* Thu Aug 26 2021 Orion Poplawski <orion@nwra.com> - 1.0.0-2
|
||||
- Re-enable armv7hl; add ppc64le eigen workaround; Cleanup test exclusions
|
||||
|
||||
* Sun Aug 22 2021 Orion Poplawski <orion@nwra.com> - 1.0.0-1
|
||||
- Update to 1.0.0
|
||||
- Drop EL7 support due to plplot 5.11 requirement
|
||||
|
||||
* Tue Aug 10 2021 Orion Poplawski <orion@nwra.com> - 1.0.0-0.6.20210123git4892c96
|
||||
- Rebuild for hdf5 1.10.7/netcdf 4.8.0
|
||||
|
||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-0.5.20210123git4892c96
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.0.0-0.4.20210123git4892c96
|
||||
- Rebuilt for Python 3.10
|
||||
|
||||
* Sat Mar 13 2021 Orion Poplawski <orion@nwra.com> - 1.0.0-0.3.20210123git4892c96
|
||||
- Add patch for PROJ 8 support
|
||||
|
||||
* Sun Mar 07 2021 Sandro Mani <manisandro@gmail.com> - 1.0.0-0.3.20210123git4892c96
|
||||
- Rebuild (proj)
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-0.2.20210123git4892c96
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Sun Jan 24 2021 Orion Poplawski <orion@nwra.com> - 1.0.0-0.1.20210123git4892c96
|
||||
- Update to latest git
|
||||
|
||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.9-20.20190915git2870075
|
||||
- Second attempt - Rebuilt for
|
||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.9-19.20190915git2870075
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 0.9.9-18.20190915git2870075
|
||||
- Use make macros
|
||||
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
|
||||
|
||||
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 0.9.9-17.20190915git2870075
|
||||
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||
|
||||
* Fri Jun 26 2020 Orion Poplawski <orion@nwra.com> - 0.9.9-16.20190915git2870075
|
||||
- Rebuild for hdf5 1.10.6
|
||||
|
||||
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 0.9.9-15.20190915git2870075
|
||||
- Rebuilt for Python 3.9
|
||||
|
||||
* Thu Apr 02 2020 Björn Esser <besser82@fedoraproject.org> - 0.9.9-14.20190915git2870075
|
||||
- Fix string quoting for rpm >= 4.16
|
||||
- Add BR: expat-devel
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.9-13.20190915git2870075
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Sun Sep 29 2019 Orion Poplawski <orion@nwra.com> - 0.9.9-12.20190915git2870075
|
||||
- Rebuild for plplot 5.15
|
||||
|
||||
* Tue Sep 17 2019 Orion Poplawski <orion@nwra.com> - 0.9.9-11.20190915git2870075
|
||||
- Update to latest git
|
||||
|
||||
* Tue Aug 20 2019 Susi Lehtola <jussilehtola@fedoraproject.org> - 0.9.9-10
|
||||
- Rebuilt for GSL 2.6.
|
||||
|
||||
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.9.9-9
|
||||
- Rebuilt for Python 3.8
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.9-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sat Mar 16 2019 Orion Poplawski <orion@nwra.com> - 0.9.9-7
|
||||
- Rebuild for hdf5 1.10.5
|
||||
|
||||
* Fri Feb 22 2019 Orion Poplawski <orion@nwra.com> - 0.9.9-6
|
||||
- test_bug_635 fails on F28 ppc64
|
||||
|
||||
* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.9.9-5
|
||||
- Rebuild for readline 8.0
|
||||
|
||||
* Wed Feb 13 2019 Orion Poplawski <orion@nwra.com> - 0.9.9-4
|
||||
- Use eccodes where available
|
||||
- Add patches to fix build
|
||||
- Use cmake3 for EPEL7 compat
|
||||
|
||||
* Wed Feb 13 2019 Orion Poplawski <orion@nwra.com> - 0.9.9-3
|
||||
- Rebuild for plplot 5.14
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.9-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Sat Dec 1 2018 Orion Poplawski <orion@nwra.com> - 0.9.9-1
|
||||
- Update to 0.9.9
|
||||
|
||||
* Wed Oct 31 2018 Orion Poplawski <orion@nwra.com> - 0.9.8-7.20180919gitd892ee5
|
||||
- Really use eccodes by fixing typo (bug #1644928)
|
||||
|
||||
* Thu Sep 20 2018 Orion Poplawski <orion@nwra.com> - 0.9.8-6.20180919gitd892ee5
|
||||
- Update to latest git
|
||||
- Port to python 3
|
||||
|
||||
* Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 0.9.8-5.20180723gitf3b6e01
|
||||
- Rebuild with fixed binutils
|
||||
|
||||
* Mon Jul 23 2018 Orion Poplawski <orion@nwra.com> - 0.9.8-4.20180723gitf3b6e01
|
||||
- Update to latest git
|
||||
- Switch to eccodes from grib_api for Fedora 28+
|
||||
|
||||
* Sun Jul 22 2018 Scott Talbert <swt@techie.net> - 0.9.8-3
|
||||
- Rebuild with wxWidgets 3.0
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.8-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Sun May 20 2018 Orion Poplawski <orion@cora.nwra.com> - 0.9.8-1
|
||||
- Update to 0.9.8
|
||||
- Drop parallel make for now
|
||||
- Use libtirpc
|
||||
- Switch to Xorg dummy driver for tests, fail build on test failure
|
||||
- Add patch to fix ppc64 altivec vector usage
|
||||
- Add patches to fix various warnings
|
||||
|
||||
* Thu Mar 01 2018 Iryna Shcherbina <ishcherb@redhat.com> - 0.9.7-11
|
||||
- Update Python 2 dependency declarations to new packaging standards
|
||||
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
|
||||
|
||||
* Wed Feb 21 2018 Orion Poplawski <orion@cora.nwra.com> - 0.9.7-10
|
||||
- Explicitly use python2
|
||||
- Build with libtirpc
|
||||
|
||||
* Tue Feb 20 2018 Orion Poplawski <orion@cora.nwra.com> - 0.9.7-10
|
||||
- Rebuild for hdf5 1.8.20
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.7-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.9.7-8
|
||||
- Add Provides for the old name without %%_isa
|
||||
|
||||
* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.9.7-7
|
||||
- Python 2 binary package renamed to python2-gdl
|
||||
See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
|
||||
|
||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.7-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.7-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Fri Jun 23 2017 Tom Callaway <spot@fedoraproject.org> - 0.9.7-4
|
||||
- rebuild for plplot 5.12.0
|
||||
|
||||
* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.7-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.7-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Wed Feb 1 2017 Orion Poplawski <orion@cora.nwra.com> - 0.9.7-1
|
||||
- Update to 0.9.7
|
||||
|
||||
* Thu Jan 12 2017 Igor Gnatenko <ignatenko@redhat.com> - 0.9.6-10
|
||||
- Rebuild for readline 7.x
|
||||
|
||||
* Wed Dec 28 2016 Rich Mattes <richmattes@gmail.com> - 0.9.6-9
|
||||
- Rebuild for eigen3-3.3.1
|
||||
|
||||
* Mon Sep 26 2016 Orion Poplawski <orion@cora.nwra.com> - 0.9.6-8
|
||||
- Keep tabs on failing tests
|
||||
|
||||
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.6-7
|
||||
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
|
||||
|
||||
* Wed Jun 29 2016 Orion Poplawski <orion@cora.nwra.com> - 0.9.6-6
|
||||
- Rebuild for hdf5 1.8.17
|
||||
|
||||
* Thu Mar 3 2016 Orion Poplawski <orion@cora.nwra.com> - 0.9.6-5
|
||||
- Add patch to build with gcc 6
|
||||
|
||||
* Mon Feb 22 2016 Orion Poplawski <orion@cora.nwra.com> - 0.9.6-4
|
||||
- Rebuild for gsl 2.1
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.6-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Fri Jan 22 2016 Orion Poplawski <orion@cora.nwra.com> - 0.9.6-2
|
||||
- Rebuild for netcdf 4.4.0
|
||||
|
||||
* Thu Jan 7 2016 Orion Poplawski <orion@cora.nwra.com> - 0.9.6-1
|
||||
- Update to 0.9.6
|
||||
- Drop setting -DH5_USE_16_API and -fPIC
|
||||
- Drop plplot patch applied upstream
|
||||
- Add patch to fix file_move test
|
||||
- Run tests with Xvfb and metacity
|
||||
- Use %%license
|
||||
|
||||
* Sun Oct 04 2015 Rex Dieter <rdieter@fedoraproject.org> - 0.9.5-10
|
||||
- rebuild (GraphicsMagick)
|
||||
|
||||
* Wed Jul 15 2015 Orion Poplawski <orion@cora.nwra.com> - 0.9.5-9
|
||||
- Rebuild for grib_api 1.14.0 soname bump
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.5-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Sun May 17 2015 Orion Poplawski <orion@cora.nwra.com> - 0.9.5-7
|
||||
- Rebuild for hdf5 1.8.15
|
||||
|
||||
* Fri Apr 24 2015 Orion Poplawski <orion@cora.nwra.com> - 0.9.5-6
|
||||
- Add patch for plplot 5.11.0 support
|
||||
|
||||
* Mon Mar 09 2015 Rex Dieter <rdieter@fedoraproject.org> 0.9.5-5
|
||||
- rebuild (GraphicsMagick)
|
||||
|
||||
* Wed Jan 07 2015 Orion Poplawski <orion@cora.nwra.com> - 0.9.5-4
|
||||
- Rebuild for hdf5 1.8.4
|
||||
|
||||
* Tue Nov 18 2014 Orion Poplawski <orion@cora.nwra.com> - 0.9.5-3
|
||||
- Exclude test_zip
|
||||
|
||||
* Fri Oct 31 2014 Orion Poplawski <orion@cora.nwra.com> - 0.9.5-2
|
||||
- No longer need cmake28 on RHEL6
|
||||
|
||||
* Wed Oct 8 2014 Orion Poplawski <orion@cora.nwra.com> - 0.9.5-1
|
||||
- Update to 0.9.5
|
||||
|
||||
* Fri Oct 3 2014 Orion Poplawski <orion@cora.nwra.com> - 0.9.4-7
|
||||
- Re-enable openmp. Appears to be working now.
|
||||
|
||||
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.4-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Wed Jul 23 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 0.9.4-5
|
||||
- Disable tests which fail on aarch64 (#990749)
|
||||
|
||||
* Tue Jun 10 2014 Orion Poplawski <orion@cora.nwra.com> - 0.9.4-4
|
||||
- Fix python find_package usage
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.4-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Sat Dec 28 2013 Orion Poplawski <orion@cora.nwra.com> - 0.9.4-2
|
||||
- Rebuild for hdf5 1.8.12
|
||||
|
||||
* Tue Oct 8 2013 Orion Poplawski <orion@cora.nwra.com> - 0.9.4-1
|
||||
- Disable openmp for now due to issues with eigen3 matrix multiply
|
||||
|
||||
* Fri Oct 4 2013 Orion Poplawski <orion@cora.nwra.com> - 0.9.4-1
|
||||
- Add patch to fix use of dynamically sized matrices with Eigen3
|
||||
- Add patch to fix -Wreorder warnings
|
||||
- Update gsl patch to match current cvs
|
||||
|
||||
* Mon Sep 30 2013 Orion Poplawski <orion@cora.nwra.com> - 0.9.4-1
|
||||
- Update to 0.9.4
|
||||
- Update build patch - drop automake components
|
||||
- New python patch to fix python build
|
||||
- Add patch to fix gsl usage
|
||||
- Add patch for test debugging
|
||||
|
||||
* Tue Aug 27 2013 Orion Poplawski <orion@cora.nwra.com> - 0.9.3-10.cvs20130804
|
||||
- Add patch to support new width() method in plplot
|
||||
|
||||
* Fri Aug 23 2013 Orion Poplawski <orion@cora.nwra.com> - 0.9.3-10.cvs20130804
|
||||
- Build with shared grib_api
|
||||
|
||||
* Sun Aug 4 2013 Orion Poplawski <orion@cora.nwra.com> - 0.9.3-9.cvs20130804
|
||||
- Update cvs patch to current cvs
|
||||
- Drop test_ce patch, enable test_ce
|
||||
|
||||
* Wed Jul 31 2013 Orion Poplawski <orion@cora.nwra.com> - 0.9.3-8.cvs20130731
|
||||
- Update cvs patch to current cvs
|
||||
- Add patch to fix segfault in test_ce
|
||||
- Cleanup test excludes, note bugs for failing tests
|
||||
|
||||
* Thu May 16 2013 Orion Poplawski <orion@cora.nwra.com> - 0.9.3-7.cvs20130516
|
||||
- Update cvs patch to current cvs
|
||||
- Drop test_ce,tests, netcdf, and python patch applied upstream
|
||||
- Rebuild for hdf5 1.8.11
|
||||
- Switch to GraphicsMagick
|
||||
|
||||
* Fri Mar 22 2013 Orion Poplawski <orion@cora.nwra.com> - 0.9.3-6.cvs20130321
|
||||
- Update cvs patch to current cvs
|
||||
- Add patch to use python 2 with cmake
|
||||
|
||||
* Wed Mar 20 2013 Orion Poplawski <orion@cora.nwra.com> - 0.9.3-5
|
||||
- Add patch to handle netcdf better with cmake
|
||||
- BR netcdf-devel instead of netcdf-cxx-devel
|
||||
|
||||
* Fri Mar 15 2013 Orion Poplawski <orion@cora.nwra.com> - 0.9.3-4
|
||||
- Change to use cmake
|
||||
- Update to current cvs via patch
|
||||
- Add patches to fix tests under cmake
|
||||
- Build with eigen3
|
||||
|
||||
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.3-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Fri Jan 18 2013 Adam Tkac <atkac redhat com> - 0.9.3-2
|
||||
- rebuild due to "jpeg8-ABI" feature drop
|
||||
|
||||
* Thu Dec 27 2012 Orion Poplawski <orion@cora.nwra.com> - 0.9.3-1
|
||||
- Update to 0.9.3
|
||||
- Rebase antlr-auto patch
|
||||
|
||||
* Mon Dec 3 2012 Orion Poplawski <orion@cora.nwra.com> - 0.9.2-10.cvs20120717
|
||||
- Rebuild for hdf5 1.8.10
|
||||
|
||||
* Fri Jul 27 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.2-9.cvs20120717
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Tue Jul 17 2012 Orion Poplawski <orion@cora.nwra.com> - 0.9.2-8.cvs20120717
|
||||
- Update to current cvs
|
||||
- Drop env patch fixed upstream
|
||||
|
||||
* Mon Jul 16 2012 Orion Poplawski <orion@cora.nwra.com> - 0.9.2-7.cvs20120716
|
||||
- Update to current cvs
|
||||
|
||||
* Tue May 15 2012 Orion Poplawski <orion@cora.nwra.com> - 0.9.2-6.cvs20120515
|
||||
- Update to current cvs
|
||||
- Add patch for testsuite make check to work in build directory
|
||||
- Add patch to fix pythongdl.c compile
|
||||
- Run the testsuite properly with make check
|
||||
|
||||
* Wed Mar 21 2012 Orion Poplawski <orion@cora.nwra.com> - 0.9.2-5
|
||||
- Rebuild antlr generated files
|
||||
- Rebuild for ImageMagick
|
||||
|
||||
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.2-4
|
||||
- Rebuilt for c++ ABI breakage
|
||||
|
||||
* Sat Jan 7 2012 Orion Poplawski <orion@cora.nwra.com> - 0.9.2-3
|
||||
- Build with pslib
|
||||
|
||||
* Wed Nov 16 2011 Orion Poplawski <orion@cora.nwra.com> - 0.9.2-2
|
||||
- Rebuild for hdf5 1.8.8
|
||||
|
||||
* Fri Nov 11 2011 Orion Poplawski <orion@cora.nwra.com> - 0.9.2-1
|
||||
- Update to 0.9.2
|
||||
- Drop upstreamed patches
|
||||
- Drop hdf support from python module, add patch to force building of python
|
||||
shared library
|
||||
|
||||
* Wed Oct 26 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.1-5
|
||||
- Rebuilt for glibc bug#747377
|
||||
|
||||
* Thu Aug 18 2011 Orion Poplawski <orion@cora.nwra.com> - 0.9.1-4
|
||||
- Rebuild for plplot 5.9.8
|
||||
- Add upstream patch to fix strsplit and str_sep
|
||||
- Add patch to fix compile issues with string
|
||||
- Add patch to change plplot SetOpt to setopt
|
||||
|
||||
* Tue May 17 2011 Orion Poplawski <orion@cora.nwra.com> - 0.9.1-3
|
||||
- Rebuild for hdf5 1.8.7
|
||||
|
||||
* Thu Mar 31 2011 Orion Poplawski <orion@cora.nwra.com> - 0.9.1-2
|
||||
- Rebuild for netcdf 4.1.2
|
||||
|
||||
* Tue Mar 29 2011 Orion Poplawski <orion@cora.nwra.com> - 0.9.1-1
|
||||
- Update to 0.9.1
|
||||
- Drop numpy and wx patches fixed upstream
|
||||
|
||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Mon Oct 11 2010 Orion Poplawski <orion@cora.nwra.com> - 0.9-5
|
||||
- Rebuild for plplot 5.9.7
|
||||
|
||||
* Wed Sep 29 2010 jkeating - 0.9-4
|
||||
- Rebuilt for gcc bug 634757
|
||||
|
||||
* Wed Sep 15 2010 Orion Poplawski <orion@cora.nwra.com> - 0.9-3
|
||||
- Fix GDL_PATH in profile scripts (bug #634351)
|
||||
|
||||
* Wed Sep 15 2010 Orion Poplawski <orion@cora.nwra.com> - 0.9-2
|
||||
- Rebuild for new ImageMagick
|
||||
|
||||
* Mon Aug 30 2010 Orion Poplawski <orion@cora.nwra.com> - 0.9-1
|
||||
- Update to 0.9 final
|
||||
|
||||
* Thu Aug 26 2010 Orion Poplawski <orion@cora.nwra.com> - 0.9-0.17.rc4
|
||||
- Add initial patch to build the python module with numpy rather than
|
||||
numarray. Doesn't work yet, but the python module is mostly dead anyway
|
||||
|
||||
* Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 0.9-0.16.rc4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
|
||||
|
||||
* Wed Jul 14 2010 Dan Horák <dan@danny.cz> - 0.9-0.15.rc4
|
||||
- rebuilt against wxGTK-2.8.11-2
|
||||
|
||||
* Wed Jul 7 2010 Orion Poplawski <orion@cora.nwra.com> - 0.9-0.14.rc4
|
||||
- Update to today's cvs
|
||||
- Drop wx-config patch
|
||||
- Re-instate wx patch to avoid segfault on test exit
|
||||
|
||||
* Thu Jun 3 2010 Orion Poplawski <orion@cora.nwra.com> - 0.9-0.13.rc4
|
||||
- Update to today's cvs
|
||||
- Drop GLDLexer and python patches
|
||||
- BR antlr-C++ on Fedora 14+
|
||||
|
||||
* Mon Mar 22 2010 Orion Poplawski <orion@cora.nwra.com> - 0.9-0.12.rc4
|
||||
- Drop unused BR on proj-devel (bug #572616)
|
||||
|
||||
* Mon Mar 8 2010 Orion Poplawski <orion@cora.nwra.com> - 0.9-0.11.rc4
|
||||
- Rebuild for new ImageMagick
|
||||
|
||||
* Wed Feb 17 2010 Orion Poplawski <orion@cora.nwra.com> - 0.9-0.10.rc4
|
||||
- Update to 0.9rc4
|
||||
- Enable grib, udunits2, and wxWidgets support
|
||||
- Build python module and add sub-package for it
|
||||
- Use %%global instead of %%define
|
||||
|
||||
* Tue Dec 8 2009 Michael Schwendt <mschwendt@fedoraproject.org> - 0.9-0.9.rc3
|
||||
- Explicitly BR hdf-static in accordance with the Packaging
|
||||
Guidelines (hdf-devel is still static-only).
|
||||
|
||||
* Wed Nov 11 2009 Orion Poplawski <orion@cora.nwra.com> - 0.9-0.8.rc3
|
||||
- Rebuild for netcdf-4.1.0
|
||||
|
||||
* Thu Oct 15 2009 Orion Poplawski <orion@cora.nwra.com> - 0.9-0.7.rc3
|
||||
- Update to 0.9rc3
|
||||
- Drop gcc43, ppc64, friend patches fixed upstream
|
||||
- Add source for makecvstarball
|
||||
- Rebase antlr patch, add automake source version
|
||||
- Add conditionals for EPEL builds
|
||||
- Add %%check section
|
||||
|
||||
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9-0.6.rc2.20090312
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Mon Mar 16 2009 Orion Poplawski <orion@cora.nwra.com> - 0.9-0.5.rc2.20090312
|
||||
- Back off building python module until configure macro is updated
|
||||
|
||||
* Thu Mar 12 2009 Orion Poplawski <orion@cora.nwra.com> - 0.9-0.4.rc2.20090312
|
||||
- Update to 0.9rc2 cvs 20090312
|
||||
- Rebase antlr patch
|
||||
- Rebuild for new ImageMagick
|
||||
|
||||
* Thu Feb 26 2009 Orion Poplawski <orion@cora.nwra.com> - 0.9-0.3.rc2.20090224
|
||||
- Build python module
|
||||
- Move common code to noarch common sub-package
|
||||
|
||||
* Tue Feb 24 2009 Orion Poplawski <orion@cora.nwra.com> - 0.9-0.2.rc2.20090224
|
||||
- Update to 0.9rc2 cvs 20090224
|
||||
- Fix release tag
|
||||
- Drop ImageMagick patch fixed upstream
|
||||
- Add patch to compile with gcc 4.4.0 - needs new friend statement
|
||||
- Don't build included copy of antlr, use system version
|
||||
|
||||
* Fri Jan 23 2009 Orion Poplawski <orion@cora.nwra.com> - 0.9-0.rc2.1
|
||||
- Update to 0.9rc2 based cvs
|
||||
|
||||
* Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 0.9-0.rc1.4.1
|
||||
- Rebuild for Python 2.6
|
||||
|
||||
* Fri Sep 5 2008 Orion Poplawski <orion@cora.nwra.com> - 0.9-0.rc1.4
|
||||
- Add a requires on plplot to pull in drivers (bug#458277)
|
||||
|
||||
* Fri May 16 2008 Orion Poplawski <orion@cora.nwra.com> - 0.9-0.rc1.3
|
||||
- Update to latest cvs
|
||||
- Add patch to handle new ImageMagick
|
||||
- Update netcdf locations
|
||||
|
||||
* Mon Apr 28 2008 Orion Poplawski <orion@cora.nwra.com> - 0.9-0.rc1.2
|
||||
- Rebuild for new ImageMagick
|
||||
|
||||
* Sat Apr 5 2008 Orion Poplawski <orion@cora.nwra.com> - 0.9-0.rc1.1
|
||||
- Update to 0.9rc1
|
||||
|
||||
* Mon Mar 17 2008 Orion Poplawski <orion@cora.nwra.com> - 0.9-0.pre6.2
|
||||
- Update cvs patch to latest cvs
|
||||
|
||||
* Tue Mar 4 2008 Orion Poplawski <orion@cora.nwra.com> - 0.9-0.pre6.1
|
||||
- Rebuild for gcc 4.3, and add patch for gcc 4.3 support
|
||||
- Add patch to build against plplot 5.9.0
|
||||
- Add cvs patch to update to latest cvs
|
||||
|
||||
* Fri Nov 2 2007 Orion Poplawski <orion@cora.nwra.com> - 0.9-0.pre6
|
||||
- Update to 0.9pre6
|
||||
|
||||
* Tue Aug 21 2007 Orion Poplawski <orion@cora.nwra.com> - 0.9-0.pre5.2
|
||||
- Add patch to fix build on ppc64
|
||||
|
||||
* Tue Aug 21 2007 Orion Poplawski <orion@cora.nwra.com> - 0.9-0.pre5.1
|
||||
- Update license tag to GPLv2+
|
||||
- Rebuild for BuildID
|
||||
|
||||
* Mon Jul 9 2007 Orion Poplawski <orion@cora.nwra.com> - 0.9-0.pre5
|
||||
- Update to 0.9pre5
|
||||
|
||||
* Tue May 22 2007 Orion Poplawski <orion@cora.nwra.com> - 0.9-0.pre4.2
|
||||
- Rebuild for netcdf 3.6.2 with shared libraries
|
||||
|
||||
* Tue Jan 9 2007 Orion Poplawski <orion@cora.nwra.com> - 0.9-0.pre4.1
|
||||
- Package the library routines and point to them by default
|
||||
|
||||
* Fri Jan 5 2007 Orion Poplawski <orion@cora.nwra.com> - 0.9-0.pre4
|
||||
- Update to 0.9pre4
|
||||
|
||||
* Mon Dec 18 2006 Orion Poplawski <orion@cora.nwra.com> - 0.9-0.pre3.4
|
||||
- Add patch for configure to handle python 2.5
|
||||
|
||||
* Thu Dec 14 2006 - Jef Spaleta <jspaleta@gmail.com> - 0.9-0.pre3.3
|
||||
- Bump and build for python 2.5
|
||||
|
||||
* Wed Nov 22 2006 Orion Poplawski <orion@cora.nwra.com> - 0.9-0.pre3.2
|
||||
- Update to 0.9pre3
|
||||
|
||||
* Wed Oct 4 2006 Orion Poplawski <orion@cora.nwra.com> - 0.9-0.pre3.1
|
||||
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
|
||||
|
||||
* Mon Sep 18 2006 Orion Poplawski <orion@cora.nwra.com> - 0.9-0.pre3
|
||||
- Rebuild for FC6
|
||||
- Add patch for specialization error caught by gcc 4.1.1
|
||||
|
||||
* Thu Jun 29 2006 Orion Poplawski <orion@cora.nwra.com> - 0.9-0.pre2
|
||||
- Update to 0.9pre2
|
||||
|
||||
* Sun Jun 11 2006 Orion Poplawski <orion@cora.nwra.com> - 0.9-0.pre.1
|
||||
- Rebuild for ImageMagick so bump
|
||||
|
||||
* Mon Apr 3 2006 Orion Poplawski <orion@cora.nwra.com> - 0.9-0.pre
|
||||
- Update to 0.9pre
|
||||
|
||||
* Fri Feb 24 2006 Orion Poplawski <orion@cora.nwra.com> - 0.8.11-4
|
||||
- Add --with-fftw to configure
|
||||
|
||||
* Thu Feb 2 2006 Orion Poplawski <orion@cora.nwra.com> - 0.8.11-3
|
||||
- Enable hdf for ppc
|
||||
- Change fftw3 to fftw
|
||||
|
||||
* Tue Jan 3 2006 Orion Poplawski <orion@cora.nwra.com> - 0.8.11-2
|
||||
- Rebuild
|
||||
|
||||
* Mon Nov 21 2005 Orion Poplawski <orion@cora.nwra.com> - 0.8.11-1
|
||||
- Upstream 0.8.11
|
||||
- Remove hdf patch fixed upstream
|
||||
- Remove X11R6 lib path - not needed with modular X
|
||||
|
||||
* Wed Nov 16 2005 Orion Poplawski <orion@cora.nwra.com> - 0.8.10-4
|
||||
- Update for new ImageMagick version
|
||||
|
||||
* Thu Sep 22 2005 Orion Poplawski <orion@cora.nwra.com> - 0.8.10-3
|
||||
- Disable hdf with configure on ppc
|
||||
|
||||
* Thu Sep 22 2005 Orion Poplawski <orion@cora.nwra.com> - 0.8.10-2
|
||||
- Don't include hdf support on ppc
|
||||
|
||||
* Fri Aug 19 2005 Orion Poplawski <orion@cora.nwra.com> - 0.8.10-1
|
||||
- Initial Fedora Extras version
|
1
sources
1
sources
@ -1 +0,0 @@
|
||||
SHA512 (gdl-1.0.2.tar.gz) = 19869b68343ae8532ec9e27c402f69986d8269cc1f4c6af55402bef74f6dbee88c82b4c67db093b3be63377afb9a9a870f7baf484c8278d54ee5a7b5a428206a
|
135
xorg.conf
135
xorg.conf
@ -1,135 +0,0 @@
|
||||
# This xorg configuration file is meant to be used
|
||||
# to start a dummy X11 server for graphical testing.
|
||||
|
||||
Section "ServerFlags"
|
||||
Option "DontVTSwitch" "true"
|
||||
Option "AllowMouseOpenFail" "true"
|
||||
Option "PciForceNone" "true"
|
||||
Option "AutoEnableDevices" "false"
|
||||
Option "AutoAddDevices" "false"
|
||||
EndSection
|
||||
|
||||
Section "InputDevice"
|
||||
Identifier "dummy_mouse"
|
||||
Option "CorePointer" "true"
|
||||
Driver "void"
|
||||
EndSection
|
||||
|
||||
Section "InputDevice"
|
||||
Identifier "dummy_keyboard"
|
||||
Option "CoreKeyboard" "true"
|
||||
Driver "void"
|
||||
EndSection
|
||||
|
||||
Section "Device"
|
||||
Identifier "dummy_videocard"
|
||||
Driver "dummy"
|
||||
Option "ConstantDPI" "true"
|
||||
#VideoRam 4096000
|
||||
#VideoRam 256000
|
||||
VideoRam 192000
|
||||
EndSection
|
||||
|
||||
Section "Monitor"
|
||||
Identifier "dummy_monitor"
|
||||
HorizSync 5.0 - 1000.0
|
||||
VertRefresh 5.0 - 200.0
|
||||
#This can be used to get a specific DPI, but only for the default resolution:
|
||||
#DisplaySize 508 317
|
||||
#NOTE: the highest modes will not work without increasing the VideoRam
|
||||
# for the dummy video card.
|
||||
Modeline "32768x32768" 15226.50 32768 35800 39488 46208 32768 32771 32781 32953
|
||||
Modeline "32768x16384" 7516.25 32768 35544 39192 45616 16384 16387 16397 16478
|
||||
Modeline "16384x8192" 2101.93 16384 16416 24400 24432 8192 8390 8403 8602
|
||||
Modeline "8192x4096" 424.46 8192 8224 9832 9864 4096 4195 4202 4301
|
||||
Modeline "5496x1200" 199.13 5496 5528 6280 6312 1200 1228 1233 1261
|
||||
Modeline "5280x1080" 169.96 5280 5312 5952 5984 1080 1105 1110 1135
|
||||
Modeline "5280x1200" 191.40 5280 5312 6032 6064 1200 1228 1233 1261
|
||||
Modeline "5120x3200" 199.75 5120 5152 5904 5936 3200 3277 3283 3361
|
||||
Modeline "4800x1200" 64.42 4800 4832 5072 5104 1200 1229 1231 1261
|
||||
Modeline "3840x2880" 133.43 3840 3872 4376 4408 2880 2950 2955 3025
|
||||
Modeline "3840x2560" 116.93 3840 3872 4312 4344 2560 2622 2627 2689
|
||||
Modeline "3840x2048" 91.45 3840 3872 4216 4248 2048 2097 2101 2151
|
||||
Modeline "3840x1080" 100.38 3840 3848 4216 4592 1080 1081 1084 1093
|
||||
Modeline "3600x1200" 106.06 3600 3632 3984 4368 1200 1201 1204 1214
|
||||
Modeline "3288x1080" 39.76 3288 3320 3464 3496 1080 1106 1108 1135
|
||||
Modeline "2048x2048" 49.47 2048 2080 2264 2296 2048 2097 2101 2151
|
||||
Modeline "2048x1536" 80.06 2048 2104 2312 2576 1536 1537 1540 1554
|
||||
Modeline "2560x1600" 47.12 2560 2592 2768 2800 1600 1639 1642 1681
|
||||
Modeline "2560x1440" 42.12 2560 2592 2752 2784 1440 1475 1478 1513
|
||||
Modeline "1920x1440" 69.47 1920 1960 2152 2384 1440 1441 1444 1457
|
||||
Modeline "1920x1200" 26.28 1920 1952 2048 2080 1200 1229 1231 1261
|
||||
Modeline "1920x1080" 23.53 1920 1952 2040 2072 1080 1106 1108 1135
|
||||
Modeline "1680x1050" 20.08 1680 1712 1784 1816 1050 1075 1077 1103
|
||||
Modeline "1600x1200" 22.04 1600 1632 1712 1744 1200 1229 1231 1261
|
||||
Modeline "1600x900" 33.92 1600 1632 1760 1792 900 921 924 946
|
||||
Modeline "1440x900" 30.66 1440 1472 1584 1616 900 921 924 946
|
||||
ModeLine "1366x768" 72.00 1366 1414 1446 1494 768 771 777 803
|
||||
Modeline "1280x1024" 31.50 1280 1312 1424 1456 1024 1048 1052 1076
|
||||
Modeline "1280x800" 24.15 1280 1312 1400 1432 800 819 822 841
|
||||
Modeline "1280x768" 23.11 1280 1312 1392 1424 768 786 789 807
|
||||
Modeline "1360x768" 24.49 1360 1392 1480 1512 768 786 789 807
|
||||
Modeline "1024x768" 18.71 1024 1056 1120 1152 768 786 789 807
|
||||
Modeline "768x1024" 19.50 768 800 872 904 1024 1048 1052 1076
|
||||
|
||||
|
||||
#common resolutions for android devices (both orientations):
|
||||
Modeline "800x1280" 25.89 800 832 928 960 1280 1310 1315 1345
|
||||
Modeline "1280x800" 24.15 1280 1312 1400 1432 800 819 822 841
|
||||
Modeline "720x1280" 30.22 720 752 864 896 1280 1309 1315 1345
|
||||
Modeline "1280x720" 27.41 1280 1312 1416 1448 720 737 740 757
|
||||
Modeline "768x1024" 24.93 768 800 888 920 1024 1047 1052 1076
|
||||
Modeline "1024x768" 23.77 1024 1056 1144 1176 768 785 789 807
|
||||
Modeline "600x1024" 19.90 600 632 704 736 1024 1047 1052 1076
|
||||
Modeline "1024x600" 18.26 1024 1056 1120 1152 600 614 617 631
|
||||
Modeline "536x960" 16.74 536 568 624 656 960 982 986 1009
|
||||
Modeline "960x536" 15.23 960 992 1048 1080 536 548 551 563
|
||||
Modeline "600x800" 15.17 600 632 688 720 800 818 822 841
|
||||
Modeline "800x600" 14.50 800 832 880 912 600 614 617 631
|
||||
Modeline "480x854" 13.34 480 512 560 592 854 873 877 897
|
||||
Modeline "848x480" 12.09 848 880 920 952 480 491 493 505
|
||||
Modeline "480x800" 12.43 480 512 552 584 800 818 822 841
|
||||
Modeline "800x480" 11.46 800 832 872 904 480 491 493 505
|
||||
#resolutions for android devices (both orientations)
|
||||
#minus the status bar
|
||||
#38px status bar (and width rounded up)
|
||||
Modeline "800x1242" 25.03 800 832 920 952 1242 1271 1275 1305
|
||||
Modeline "1280x762" 22.93 1280 1312 1392 1424 762 780 783 801
|
||||
Modeline "720x1242" 29.20 720 752 856 888 1242 1271 1276 1305
|
||||
Modeline "1280x682" 25.85 1280 1312 1408 1440 682 698 701 717
|
||||
Modeline "768x986" 23.90 768 800 888 920 986 1009 1013 1036
|
||||
Modeline "1024x730" 22.50 1024 1056 1136 1168 730 747 750 767
|
||||
Modeline "600x986" 19.07 600 632 704 736 986 1009 1013 1036
|
||||
Modeline "1024x562" 17.03 1024 1056 1120 1152 562 575 578 591
|
||||
Modeline "536x922" 16.01 536 568 624 656 922 943 947 969
|
||||
Modeline "960x498" 14.09 960 992 1040 1072 498 509 511 523
|
||||
Modeline "600x762" 14.39 600 632 680 712 762 779 783 801
|
||||
Modeline "800x562" 13.52 800 832 880 912 562 575 578 591
|
||||
Modeline "480x810" 12.59 480 512 552 584 810 828 832 851
|
||||
Modeline "848x442" 11.09 848 880 920 952 442 452 454 465
|
||||
Modeline "480x762" 11.79 480 512 552 584 762 779 783 801
|
||||
EndSection
|
||||
|
||||
Section "Screen"
|
||||
Identifier "dummy_screen"
|
||||
Device "dummy_videocard"
|
||||
Monitor "dummy_monitor"
|
||||
DefaultDepth 24
|
||||
SubSectionSub "Display"
|
||||
Viewport 0 0
|
||||
Depth 24
|
||||
#Modes "32768x32768" "32768x16384" "16384x8192" "8192x4096" "5120x3200" "3840x2880" "3840x2560" "3840x2048" "2048x2048" "2560x1600" "1920x1440" "1920x1200" "1920x1080" "1600x1200" "1680x1050" "1600x900" "1400x1050" "1440x900" "1280x1024" "1366x768" "1280x800" "1024x768" "1024x600" "800x600" "320x200"
|
||||
Modes "5120x3200" "3840x2880" "3840x2560" "3840x2048" "2048x2048" "2560x1600" "1920x1440" "1920x1200" "1920x1080" "1600x1200" "1680x1050" "1600x900" "1400x1050" "1440x900" "1280x1024" "1366x768" "1280x800" "1024x768" "1024x600" "800x600" "320x200"
|
||||
#Virtual 32000 32000
|
||||
#Virtual 16384 8192
|
||||
Virtual 8192 4096
|
||||
#Virtual 5120 3200
|
||||
EndSubSection
|
||||
EndSection
|
||||
|
||||
Section "ServerLayout"
|
||||
Identifier "dummy_layout"
|
||||
Screen "dummy_screen"
|
||||
InputDevice "dummy_mouse"
|
||||
InputDevice "dummy_keyboard"
|
||||
EndSection
|
Loading…
Reference in New Issue
Block a user