rpm/finalcut
SHA256
1
0
Fork 0
forked from pool/finalcut
Code Pull Requests Activity

Accepting request 848624 from devel:libraries:c_c++

Browse Source 
- Release (version 0.7.1)
- Release (version 0.7.0)
- Release (version 0.6.1 pre-release 0.7.0)
- deleted patch
  - 0001-arm-glibc-2.30.patch (upstreamed)

OBS-URL: https://build.opensuse.org/request/show/848624
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/finalcut?expand=0&rev=6
This commit is contained in:
Dominique Leuenberger 2020-11-17 20:21:57 +00:00 committed by Git OBS Bridge
commit be70342b10
5 changed files with 44 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
0001-arm-glibc-2.30.patch
View File

@ -1,65 +0,0 @@
--- a/src/include/final/fsystemimpl.h
+++ b/src/include/final/fsystemimpl.h
@@ -36,9 +36,19 @@
#endif
#if defined(__linux__)
- #if defined(__x86_64__) || defined(__i386) || defined(__arm__)
- #include <sys/io.h> // <asm/io.h> is deprecated
- #endif // defined(__x86_64__) || defined(__i386) || defined(__arm__)
+
+ #if defined(__arm__) && defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+ // ISA sysctl support on arm processors only up to glibc-2.29
+ #if !__GLIBC_PREREQ(2,30)
+ #define ARM_ISA_SYSCTL
+ #endif
+ #endif
+
+ #if defined(__x86_64__) || defined(__i386) || defined(ARM_ISA_SYSCTL)
+ #define ISA_SYSCTL_SUPPORT
+ #include <sys/io.h>
+ #endif // defined(__x86_64__) || defined(__i386) || defined(ARM_ISA_SYSCTL)
+
#endif // defined(__linux__)
#if defined(__sun) && defined(__SVR4)
@@ -88,8 +98,7 @@ class FSystemImpl : public FSystem
virtual ~FSystemImpl();
// Methods
-#if defined(__linux__)
-#if defined(__x86_64__) || defined(__i386) || defined(__arm__)
+#if defined(ISA_SYSCTL_SUPPORT)
uChar inPortByte (uShort port) override
{
return ::inb (port);
@@ -100,16 +109,9 @@ class FSystemImpl : public FSystem
return 0;
}
#endif
-#else
- uChar inPortByte (uShort) override
- {
- return 0;
- }
-#endif
-#if defined(__linux__)
-#if defined(__x86_64__) || defined(__i386) || defined(__arm__)
+#if defined(ISA_SYSCTL_SUPPORT)
void outPortByte (uChar value, uShort port) override
{
::outb (value, port);
@@ -118,11 +120,6 @@ class FSystemImpl : public FSystem
void outPortByte (uChar, uShort) override
{ }
#endif
-#else
- void outPortByte (uChar, uShort) override
- { }
-#endif
-
int isTTY (int fd) override
{

3
finalcut-0.6.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8c2260104ba918a83748f6af0f01e33c35bbc4591f49567839e45cf1555b9f2f
size 672043

3
finalcut-0.7.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d85bfffa9481ac4647e07c4a6d824da5560509541966db69f59ebc214efcbee2
size 801034

17
finalcut.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Sat Nov 14 20:13:57 UTC 2020 - Markus Gans <guru.mail@muenster.de>
- Release (version 0.7.1)
-------------------------------------------------------------------
Sat Nov 07 11:24:39 UTC 2020 - Markus Gans <guru.mail@muenster.de>
- Release (version 0.7.0)
-------------------------------------------------------------------
Wed Oct 21 11:42:02 UTC 2020 - Markus Gans <guru.mail@muenster.de>
- Release (version 0.6.1 pre-release 0.7.0)
- deleted patch
- 0001-arm-glibc-2.30.patch (upstreamed)
-------------------------------------------------------------------
Mon Jan 20 14:10:38 UTC 2020 - Ludwig Nussel <lnussel@suse.de>

42
finalcut.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package finalcut
#
# Copyright (c) 2019 by Markus Gans
# Copyright (c) 2020 by Markus Gans
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -15,17 +15,15 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define sover 0
Name: finalcut
Version: 0.6.0
Version: 0.7.1
Release: 0
Summary: Console widget library
License: LGPL-3.0-or-later
Group: Development/Libraries/C and C++
URL: https://github.com/gansm/finalcut/
Source: https://github.com/gansm/finalcut/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
Patch0: 0001-arm-glibc-2.30.patch
BuildRequires: autoconf
BuildRequires: autoconf-archive
BuildRequires: automake
@ -59,9 +57,9 @@ Requires: libfinal%{sover} = %{version}
Requires: ncurses-devel
Requires: sed
Requires: vim
Provides: finalcut-devel = %{version}
Obsoletes: finalcut-devel < %{version}
Recommends: %{name}-examples = %{version}
Provides: libfinal-devel = %{version}
Obsoletes: libfinal-devel < %{version}
Recommends: libfinal-examples = %{version}
%description -n libfinal-devel
FINAL CUT is a class library and widget toolkit with full mouse
@ -75,8 +73,8 @@ radio buttons, input lines, list boxes, status bars and so on.
%package -n libfinal-examples
Summary: Example files for the FINAL CUT library
Group: Development/Languages/C and C++
Provides: finalcut-examples = %{version}
Obsoletes: finalcut-examples < %{version}
Provides: libfinal-examples = %{version}
Obsoletes: libfinal-examples < %{version}
%description -n libfinal-examples
FINAL CUT is a class library and widget toolkit with full mouse
@ -101,7 +99,7 @@ common controls like dialog windows, push buttons, check boxes,
radio buttons, input lines, list boxes, status bars and so on.
%package bitmap-fonts
Summary: Bitmap fonts for finalcut
Summary: X11 bitmap font for FINAL CUT
Group: System/X11/Fonts
Requires(pre): fontconfig
# install the fonts only if we have X11 fonts anyways
@ -109,12 +107,10 @@ Supplements: packageand(libfinal%{sover}:xorg-x11-fonts-core)
BuildArch: noarch
%description bitmap-fonts
This package include a special font uses by the FINAL CUT text
widget toolkit
Special X11 bitmap font used by FINAL CUT to display graphic objects.
%prep
%setup -q
%patch0 -p1
%build
autoreconf -vif
@ -126,18 +122,25 @@ export CPPFLAGS="$CPPFLAGS -Wno-error=unused-parameter"
make %{?_smp_mflags} V=1
%install
%if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?fc#} || 0%{?el#}
%global _miscfontsdir %{_datadir}/fonts
%endif
make install libdir=%{buildroot}%{_libdir}/ \
includedir=%{buildroot}%{_includedir} \
bindir=%{buildroot}%{_bindir} \
docdir=%{buildroot}%{_docdir}/%{name}/ \
fontdir=%{buildroot}%{_miscfontsdir}/%{name}/
includedir=%{buildroot}%{_includedir} \
bindir=%{buildroot}%{_bindir} \
docdir=%{buildroot}%{_docdir}/%{name}/ \
fontdir=%{buildroot}%{_miscfontsdir}/%{name}/
mkdir -p %{buildroot}%{_miscfontsdir}/%{name}/
mkdir -p %{buildroot}%{_docdir}/%{name}
mkdir -p %{buildroot}%{_libdir}/%{name}/examples
mkdir -p %{buildroot}/etc/fonts/conf.d
mkdir -p %{buildroot}/usr/share/fontconfig/conf.avail
cp -p examples/.libs/* %{buildroot}%{_libdir}/%{name}/examples
cp -p examples/*.cpp %{buildroot}%{_libdir}/%{name}/examples
cp -p examples/Makefile.clang %{buildroot}%{_libdir}/%{name}/examples
cp -p examples/Makefile.gcc %{buildroot}%{_libdir}/%{name}/examples
cp -p fonts/40-finalcut-newfont.conf %{buildroot}/usr/share/fontconfig/conf.avail
ln -s /usr/share/fontconfig/conf.avail/40-finalcut-newfont.conf %{buildroot}/etc/fonts/conf.d/40-finalcut-newfont.conf
rm -f %{buildroot}%{_libdir}/libfinal.la
rm %{buildroot}%{_docdir}/%{name}/ChangeLog %{buildroot}%{_docdir}/%{name}/COPYING.LESSER
# Add config for X font path
@ -147,7 +150,6 @@ Section "Files"
FontPath "%{_miscfontsdir}/finalcut:unscaled"
EndSection
EOF
#
# make sure we own all generated files
for i in .fonts-config-timestamp encodings.dir fonts.dir fonts.scale; do
> %{buildroot}%{_miscfontsdir}/finalcut/$i
@ -186,8 +188,12 @@ done
%ghost %{_miscfontsdir}/finalcut/fonts.scale
%ghost %{_miscfontsdir}/finalcut/encodings.dir
%ghost %{_miscfontsdir}/finalcut/.fonts-config-timestamp
%dir /etc/fonts/conf.d/
%dir /usr/share/fontconfig/conf.avail
%dir %{_datadir}/X11
%dir %{_datadir}/X11/xorg.conf.d
%{_datadir}/X11/xorg.conf.d/80-finalcut-bitmap-fonts.conf
/etc/fonts/conf.d/40-finalcut-newfont.conf
/usr/share/fontconfig/conf.avail/40-finalcut-newfont.conf
%changelog