[dwarftherapist] Initial import (#4059).
by Ben Rosser
commit 771de072987435b10a737818957a68d0c81288fd
Author: Ben Rosser <rosser.bjr(a)gmail.com>
Date: Tue Feb 27 11:45:15 2018 -0500
Initial import (#4059).
.gitignore | 2 +
dwarftherapist.spec | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
3 files changed, 143 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index e69de29..1f0e90d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*.rpm
+/dwarftherapist-39.2.1.tar.gz
diff --git a/dwarftherapist.spec b/dwarftherapist.spec
new file mode 100644
index 0000000..8d5336e
--- /dev/null
+++ b/dwarftherapist.spec
@@ -0,0 +1,140 @@
+Name: dwarftherapist
+Version: 39.2.1
+Release: 1%{?dist}
+Summary: Management tool designed to run side-by-side with Dwarf Fortress
+
+License: MIT
+URL: https://github.com/Dwarf-Therapist/Dwarf-Therapist
+Source0: https://github.com/Dwarf-Therapist/Dwarf-Therapist/archive/v%{version}/dw...
+
+# Need cmake.
+BuildRequires: cmake
+
+# Qt5 dependencies.
+BuildRequires: qt5-qtbase-devel
+BuildRequires: qt5-qtdeclarative-devel
+
+# Desktop file utils.
+BuildRequires: desktop-file-utils
+
+# dos2unix, for fixing a file.
+BuildRequires: dos2unix
+
+# Required for post step.
+Requires(post): /usr/sbin/setcap
+
+# We need Dwarf Fortress for Therapist to be useful! Therefore
+# we should only build on x86_64 and i686 as these are the only
+# arches DF exists on.
+Requires: dwarffortress
+ExclusiveArch: x86_64 i686
+
+Requires: hicolor-icon-theme
+
+# Require the noarch data package.
+Requires: dwarftherapist-data = %{version}-%{release}
+
+%description
+Management tool designed to run side-by-side with Dwarf Fortress.
+Offers several views and interface improvements to Dwarf Fortress.
+Some features include:
+
+Persistent custom professions - import and manage any number of custom
+professions across all your forts.
+
+Assign multiple dwarves to a custom profession at once to unify active labors.
+
+Manage labors and professions much more easily than in-game using a flexible
+UI, allowing quick review of all dwarves at-a-glance.
+
+Display all pending changes before they're written to the game.
+
+Sort labor columns by associated skill level.
+
+Persistent and customizable display; change colors, reposition/hide
+information screens.
+
+Group your dwarves by several criteria.
+
+This is a heavily modified version of the original Dwarf Therapist that
+is still maintained for new versions of Dwarf Fortress.
+
+%package data
+
+BuildArch: noarch
+Summary: Architecture independent data files for Dwarf Therapist
+
+%description data
+
+This package contains architecture independent data files for Dwarf Therapist,
+a management tool designed to run side-by-side with the video game Dwarf
+Fortress. For more information, see the description of the main dwarftherapist
+package.
+
+%prep
+%setup -qn Dwarf-Therapist-%{version}
+dos2unix CHANGELOG.txt
+
+%build
+%cmake
+%make_build
+
+%install
+%make_install
+
+# Check the desktop file.
+desktop-file-validate %{buildroot}/%{_datadir}/applications/dwarftherapist.desktop
+
+# Install the resources?
+cp -rp resources/* %{buildroot}%{_datadir}/dwarftherapist/
+mkdir -p %{buildroot}%{_datadir}/pixmaps
+cp -p resources/img/*.xpm %{buildroot}%{_datadir}/pixmaps/
+
+# Remove an extra copy of the license.
+rm %{buildroot}%{_docdir}/dwarftherapist/LICENSE.txt
+
+# There used to be a link from /usr/bin/dwarftherapist -> /usr/bin/DwarfTherapist
+# (or a wrapper script or something). Create one manually.
+ln -s %{_bindir}/DwarfTherapist %{buildroot}%{_bindir}/dwarftherapist
+
+# Post install script; set cap permissions.
+%post
+sudo setcap cap_sys_ptrace=eip %{_bindir}/DwarfTherapist
+
+%files
+%{_bindir}/DwarfTherapist
+%{_bindir}/dwarftherapist
+%{_datadir}/applications/dwarftherapist.desktop
+%{_datadir}/pixmaps/dwarftherapist.*
+%{_datadir}/icons/hicolor/*/apps/dwarftherapist.png
+%doc README.rst CHANGELOG.txt
+%license LICENSE.txt
+
+%files data
+%{_datadir}/dwarftherapist
+%license LICENSE.txt
+
+%changelog
+* Wed Feb 21 2018 Ben Rosser <rosser.bjr(a)gmail.com> - 39.2.1-1
+- Update to new upstream release.
+- Split out /usr/share/dwarftherapist into noarch data subpackage.
+- Make setcap a Requires(post), rather than just Requires.
+- Add requires on hicolor-icon-theme.
+
+* Tue Jan 30 2018 Ben Rosser <rosser.bjr(a)gmail.com> - 39.2.0-1
+- Update to new upstream, with new release supporting new DF releases.
+
+* Sat Jul 16 2016 Ben Rosser <rosser.bjr(a)gmail.com> - 37.0.0-4
+- Add newer memory layouts from git for 0.43.02, 0.43.03.
+- Compatibility with EL7; this just requires disabling compiling the documentation.
+
+* Fri Jun 17 2016 Ben Rosser <rosser.bjr(a)gmail.com> - 37.0.0-3
+- Arched dependency on dwarffortress is unnecessary.
+
+* Thu May 19 2016 Ben Rosser <rosser.bjr(a)gmail.com> - 37.0.0-2
+- Fix line endings on the changelog file.
+- Slightly reword description.
+- Build latex documentation multiple times to get cross-references correct.
+
+* Wed May 18 2016 Ben Rosser <rosser.bjr(a)gmail.com> - 37.0.0-1
+- Initial package.
diff --git a/sources b/sources
index e69de29..3856a82 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+eb9a2b523dd7c5de68dda1c1ad8ce9d8 dwarftherapist-39.2.1.tar.gz
6 years, 2 months
[x265] Update to 2.7
by Leigh Scott
commit 2ff9ef80853e065a2272b4554713e3976aa52ca7
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Feb 27 16:18:33 2018 +0000
Update to 2.7
.gitignore | 1 +
sources | 2 +-
x265-pic.patch | 12 ------------
x265-test-shared.patch | 11 -----------
x265.spec | 37 ++++++++++++++++++++-----------------
5 files changed, 22 insertions(+), 41 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 966f6ce..594d208 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ x265_1.6.tar.gz
/x265_2.4.tar.gz
/x265_2.5.tar.gz
/x265_2.6.tar.gz
+/x265_2.7.tar.gz
diff --git a/sources b/sources
index e9dc3a9..7181119 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4d318be1f19b58985432a144bd054572 x265_2.6.tar.gz
+b0d7d20da2a418fa4f53a559946ea079 x265_2.7.tar.gz
diff --git a/x265-pic.patch b/x265-pic.patch
index 65e89fd..e612f44 100644
--- a/x265-pic.patch
+++ b/x265-pic.patch
@@ -10,15 +10,3 @@
if(NATIVE_BUILD)
if(INTEL_CXX)
-diff -up x265_1.8/source/test/checkasm-a.asm.pic x265_1.8/source/test/checkasm-a.asm
---- x265_1.8/source/test/checkasm-a.asm.pic 2015-09-22 10:10:07.000000000 +0200
-+++ x265_1.8/source/test/checkasm-a.asm 2015-10-25 23:23:45.041877640 +0100
-@@ -154,7 +154,7 @@ cglobal checkasm_call, 2,15,16,max_args*
- mov r9, rax
- mov r10, rdx
- lea r0, [error_message]
-- call puts
-+ call puts wrt ..plt
- mov r1, [rsp+max_args*8]
- mov dword [r1], 0
- mov rdx, r10
diff --git a/x265.spec b/x265.spec
index f390ad0..4673eca 100644
--- a/x265.spec
+++ b/x265.spec
@@ -1,8 +1,8 @@
-%global _so_version 146
+%global _so_version 151
Summary: H.265/HEVC encoder
Name: x265
-Version: 2.6
+Version: 2.7
Release: 1%{?dist}
URL: http://x265.org/
# source/Lib/TLibCommon - BSD
@@ -12,15 +12,14 @@ License: GPLv2+ and BSD
Source0: https://bitbucket.org/multicoreware/%{name}/downloads/%{name}_%{version}....
-# link test binaries with shared library
-Patch1: x265-test-shared.patch
# fix building as PIC
-Patch2: x265-pic.patch
-Patch3: x265-high-bit-depth-soname.patch
-Patch4: x265-detect_cpu_armhfp.patch
+Patch0: x265-pic.patch
+Patch1: x265-high-bit-depth-soname.patch
+Patch2: x265-detect_cpu_armhfp.patch
-BuildRequires: cmake
-BuildRequires: yasm
+BuildRequires: cmake3
+BuildRequires: nasm
+BuildRequires: ninja-build
%ifnarch armv7hl armv7hnl s390 s390x
BuildRequires: numactl-devel
@@ -55,7 +54,7 @@ performance on a wide variety of hardware platforms.
This package contains the shared library development files.
%prep
-%autosetup -p1 -n %{name}_v%{version}
+%autosetup -p1 -n %{name}_%{version}
%build
# High depth libraries (from source/h265.h):
@@ -66,14 +65,14 @@ This package contains the shared library development files.
# 10bit: libx265_main10.so
build() {
-%cmake -G "Unix Makefiles" \
+%cmake3 -G "Ninja" \
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON \
-DCMAKE_SKIP_RPATH:BOOL=YES \
-DENABLE_PIC:BOOL=ON \
-DENABLE_TESTS:BOOL=ON \
$* \
../source
-%make_build
+%ninja_build
}
# High depth 10/12 bit libraries are supported only on 64 bit. They require
@@ -97,7 +96,7 @@ popd
for i in 8 10 12; do
if [ -d ${i}bit ]; then
pushd ${i}bit
- %make_install
+ %ninja_install
# Remove unversioned library, should not be linked to
rm -f %{buildroot}%{_libdir}/libx265_main${i}.so
popd
@@ -110,14 +109,12 @@ find %{buildroot} -name "*.a" -delete
for i in 8 10 12; do
if [ -d ${i}bit ]; then
pushd ${i}bit
- LD_LIBRARY_PATH=%{buildroot}%{_libdir} test/TestBench || :
+ test/TestBench || :
popd
fi
done
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
+%ldconfig_scriptlets libs
%files
%{_bindir}/x265
@@ -138,6 +135,12 @@ done
%{_libdir}/pkgconfig/x265.pc
%changelog
+* Tue Feb 27 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.7-1
+- update to 2.7
+- Drop shared test patch as it causes nasm build to fail
+- Fix scriptlets
+- Use ninja to build
+
* Sat Dec 30 2017 Sérgio Basto <sergio(a)serjux.com> - 2.6-1
- Update x265 to 2.6
6 years, 2 months
[libdvdcss/el7] Initial import
by Xavier Bachelot
Summary of changes:
3d509cb... Initial import (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 2 months
[libdvdcss/el6] Initial import
by Xavier Bachelot
Summary of changes:
3d509cb... Initial import (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 2 months
[libdvdcss/f26] Initial import
by Xavier Bachelot
Summary of changes:
3d509cb... Initial import (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 2 months
[libdvdcss/f27] Initial import
by Xavier Bachelot
Summary of changes:
3d509cb... Initial import (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 2 months
[libdvdcss] Initial import
by Xavier Bachelot
commit 3d509cb39c063064d7809089c343b2b587ace4b9
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Tue Feb 27 12:12:44 2018 +0100
Initial import
.gitignore | 1 +
libdvdcss.spec | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
3 files changed, 147 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index e69de29..1ab9da6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/libdvdcss-1.4.1.tar.bz2
diff --git a/libdvdcss.spec b/libdvdcss.spec
new file mode 100644
index 0000000..4e477e6
--- /dev/null
+++ b/libdvdcss.spec
@@ -0,0 +1,145 @@
+Summary: A portable abstraction library for DVD decryption
+Name: libdvdcss
+Version: 1.4.1
+Release: 1%{?dist}
+License: GPLv2+
+Source: http://www.videolan.org/pub/videolan/libdvdcss/%{version}/libdvdcss-%{ver...
+URL: http://www.videolan.org/libdvdcss/
+
+BuildRequires: doxygen
+
+
+%description
+This is a portable abstraction library for DVD decryption which is used by
+the VideoLAN project, a full MPEG2 client/server solution. You will need
+to install this package in order to have encrypted DVD playback with the
+VideoLAN client and the Xine navigation plugin.
+
+
+%package devel
+Summary: Header files and development libraries for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description devel
+This package contains the header files and development libraries
+for %{name}. If you like to develop programs using %{name},
+you will need to install %{name}-devel.
+
+
+%prep
+%setup -q
+
+
+%build
+%configure --disable-static
+make %{_smp_mflags}
+
+
+%install
+make install DESTDIR=%{buildroot}
+
+# remove generated doc from build
+mv %{buildroot}/usr/share/doc/libdvdcss docdir
+
+# Remove all libtool archives
+find %{buildroot} -regex ".*\.la$" -delete
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
+%files
+%license COPYING
+%doc AUTHORS ChangeLog README
+%{_libdir}/%{name}.so.2*
+
+%files devel
+%doc docdir/*
+%{_includedir}/dvdcss
+%{_libdir}/%{name}.so
+%{_libdir}/pkgconfig/%{name}.pc
+
+
+%changelog
+* Thu Feb 01 2018 Xavier Bachelot <xavier(a)bachelot.org> - 1.4.1-1
+- Update to 1.4.1.
+- Clean up spec.
+
+* Fri Dec 18 2015 Remi Collet <remi(a)remirepo.net> - 1.4.0-1
+- Update to 1.4.0
+
+* Sun Aug 17 2014 Remi Collet <remi(a)remirepo.net> - 1.3.0-1
+- Update to 1.3.0
+
+* Wed Feb 27 2013 Remi Collet <remi(a)remirepo.net> - 1.2.13-1
+- Update to 1.2.13
+
+* Mon Mar 12 2012 Remi Collet <remi(a)remirepo.net> - 1.2.12-1
+- Update to 1.2.12
+
+* Sat Feb 18 2012 Remi Collet <remi(a)remirepo.net> - 1.2.11-2
+- If unsure, assume the drive is of RPC-I type
+
+* Mon Nov 21 2011 Remi Collet <remi(a)remirepo.net> - 1.2.11-1
+- Update to 1.2.11
+
+* Sat Oct 16 2010 Remi Collet <remi(a)remirepo.net> - 1.2.10-1
+- F-14 rebuild
+
+* Sun Sep 28 2008 Axel Thimm <Axel.Thimm(a)ATrpms.net> - 1.2.10-4
+- Update to 1.2.10.
+
+* Tue Sep 12 2006 Axel Thimm <Axel.Thimm(a)ATrpms.net> - 1.2.9-3
+- Update to 1.2.9.
+
+* Sun Aug 3 2003 Matthias Saou <matthias.saou(a)est.une.marmotte.net>
+- Update to 1.2.8.
+
+* Wed Jun 25 2003 Matthias Saou <matthias.saou(a)est.une.marmotte.net>
+- Update to 1.2.7.
+
+* Mon Mar 31 2003 Matthias Saou <matthias.saou(a)est.une.marmotte.net>
+- Rebuilt for Red Hat Linux 9.
+- Exclude .la file.
+
+* Tue Mar 11 2003 Matthias Saou <matthias.saou(a)est.une.marmotte.net>
+- Update to 1.2.6.
+
+* Mon Feb 3 2003 Matthias Saou <matthias.saou(a)est.une.marmotte.net>
+- Update to 1.2.5.
+
+* Fri Nov 15 2002 Matthias Saou <matthias.saou(a)est.une.marmotte.net>
+- Update to 1.2.4.
+
+* Mon Oct 21 2002 Matthias Saou <matthias.saou(a)est.une.marmotte.net>
+- Update to 1.2.3.
+
+* Thu Sep 26 2002 Matthias Saou <matthias.saou(a)est.une.marmotte.net>
+- Rebuilt for Red Hat Linux 8.0.
+
+* Mon Aug 12 2002 Matthias Saou <matthias.saou(a)est.une.marmotte.net>
+- Update to 1.2.2.
+
+* Mon Jun 3 2002 Matthias Saou <matthias.saou(a)est.une.marmotte.net>
+- Update to 1.2.1.
+
+* Fri May 24 2002 Matthias Saou <matthias.saou(a)est.une.marmotte.net>
+- Update to 1.2.0.
+
+* Thu May 2 2002 Matthias Saou <matthias.saou(a)est.une.marmotte.net>
+- Rebuilt against Red Hat Linux 7.3.
+- Added the %%{?_smp_mflags} expansion.
+
+* Mon Apr 8 2002 Matthias Saou <matthias.saou(a)est.une.marmotte.net>
+- Update to 1.1.1.
+
+* Sun Nov 4 2001 Matthias Saou <matthias.saou(a)est.une.marmotte.net>
+- Changed to the Ogle patched version of the lib.
+
+* Mon Oct 22 2001 Matthias Saou <matthias.saou(a)est.une.marmotte.net>
+- Initial RPM release.
+- Decided to put libdvdcss in a separate package since both videolan and the
+ xine DVD menu plugin use it.
+
diff --git a/sources b/sources
index e69de29..46bc7a5 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+47e7cb46fe3a5e53bec1356423b0b534 libdvdcss-1.4.1.tar.bz2
6 years, 2 months
[vlc] update for libplacebo v0.4.0 API changes
by Leigh Scott
commit 394a600156ddda355d1dd754838319bda85487f0
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Feb 27 08:40:45 2018 +0000
update for libplacebo v0.4.0 API changes
...es_video_output_opengl_fragment_shaders.c.patch | 40 ++++++++++++++++++++++
vlc.spec | 4 +++
2 files changed, 44 insertions(+)
---
diff --git a/modules_video_output_opengl_fragment_shaders.c.patch b/modules_video_output_opengl_fragment_shaders.c.patch
new file mode 100644
index 0000000..6e0ffc6
--- /dev/null
+++ b/modules_video_output_opengl_fragment_shaders.c.patch
@@ -0,0 +1,40 @@
+X-Git-Url: https://git.videolan.org/?p=vlc%2Fvlc-3.0.git;a=blobdiff_plain;f=modules%...
+
+diff --git a/modules/video_output/opengl/fragment_shaders.c b/modules/video_output/opengl/fragment_shaders.c
+index f959d9a69c..0c91a4db76 100644
+--- a/modules/video_output/opengl/fragment_shaders.c
++++ b/modules/video_output/opengl/fragment_shaders.c
+@@ -399,11 +399,18 @@ tc_base_prepare_shader(const opengl_tex_converter_t *tc,
+ continue;
+
+ struct pl_shader_var sv = res->variables[i];
++#if PL_API_VER >= 4
++ struct pl_var var = sv.var;
++ // libplacebo doesn't need anything else anyway
++ if (var.type != PL_VAR_FLOAT)
++ continue;
++#else
+ struct ra_var var = sv.var;
+-
+ // libplacebo doesn't need anything else anyway
+ if (var.type != RA_VAR_FLOAT)
+ continue;
++#endif
++
+ if (var.dim_m > 1 && var.dim_m != var.dim_v)
+ continue;
+
+@@ -657,7 +664,12 @@ opengl_fragment_shader_init_impl(opengl_tex_converter_t *tc, GLenum tex_target,
+ tc->uloc.pl_vars = calloc(res->num_variables, sizeof(GLint));
+ for (int i = 0; i < res->num_variables; i++) {
+ struct pl_shader_var sv = res->variables[i];
+- ADDF("uniform %s %s;\n", ra_var_glsl_type_name(sv.var), sv.var.name);
++#if PL_API_VER >= 4
++ const char *glsl_type_name = pl_var_glsl_type_name(sv.var);
++#else
++ const char *glsl_type_name = ra_var_glsl_type_name(sv.var);
++#endif
++ ADDF("uniform %s %s;\n", glsl_type_name, sv.var.name);
+ }
+
+ // We can't handle these yet, but nothing we use requires them, either
diff --git a/vlc.spec b/vlc.spec
index d7d66ad..400e8b0 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -48,6 +48,9 @@ License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_rc:%{vlc_vers}/}vlc-%{vlc_vers}%{?vlc_tag}.tar.xz
+# opengl: update for libplacebo v0.4.0 API changes
+# https://git.videolan.org/?p=vlc/vlc-3.0.git;a=commit;h=f33a7b19f0a55e70f1...
+Patch0: modules_video_output_opengl_fragment_shaders.c.patch
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
@@ -265,6 +268,7 @@ VLC media player extras modules.
%prep
%setup -q -n %{name}-%{vlc_vers}%{?vlc_rc:-%{vlc_rc}}
+%patch0 -p1
%{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
./bootstrap
6 years, 2 months
[vlc] Update for libplacebo
by Nicolas Chauvet
commit 18729794b52498df2a90842af8ccb3d03cf3851c
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Mon Feb 26 23:08:08 2018 +0100
Update for libplacebo
vlc.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index 8ecc155..d7d66ad 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -43,7 +43,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: %{vlc_vers}
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -121,6 +121,7 @@ BuildRequires: libtar-devel
BuildRequires: libtheora-devel
BuildRequires: libtiger-devel
BuildRequires: libtiff-devel
+BuildRequires: pkgconfig(libplacebo)
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(libvncclient)
BuildRequires: libupnp-devel
@@ -547,6 +548,9 @@ fi || :
%changelog
+* Mon Feb 26 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-3
+- Add libplacebo support
+
* Sun Feb 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.0-2
- Enable microdns (rfbz#4793)
6 years, 2 months