[xpra-codecs-freeworld/f26: 8/8] Merge branch 'master' into f26
by Antonio
commit 93894f92567e12d330e6c49f3c5afa420fdf0d2a
Merge: cd3cc7a d2a41bd
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Mon Feb 5 17:04:31 2018 +0100
Merge branch 'master' into f26
.gitignore | 2 +
sources | 2 +-
xpra-codecs-freeworld-ffmpeg35.patch | 189 +++++++++++++++++++++++++++++++++++
xpra-codecs-freeworld.spec | 18 +++-
4 files changed, 209 insertions(+), 2 deletions(-)
---
diff --cc xpra-codecs-freeworld.spec
index 13481a4,21d710a..38c0bd2
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@@ -50,7 -55,10 +55,11 @@@ x264 and ffmpeg
%prep
%setup -q -n xpra-%{version}
+
+ %if 0%{?fedora} > 27
+ %patch0 -p1
+ %endif
+
%build
CFLAGS="%{optflags}" %{__python2} setup.py build --executable="%{__python2} -s" \
%{?_with_enc_x264} \
6 years, 3 months
[xpra-codecs-freeworld/f26] (8 commits) ...Merge branch 'master' into f26
by Antonio
Summary of changes:
5accc57... Update to 2.2 (*)
66f631c... Update to 2.2.1 (*)
d8426fc... Mass rebuild for x264 and x265 (*)
87ba42f... Update to 2.2.2 (*)
8a53532... Rebuilt for ffmpeg-3.5 git (*)
d22a51d... Update to 2.2.3 (*)
d2a41bd... Patched for ffmpeg-3.5 (*)
93894f9... Merge branch 'master' into f26
(*) This commit already existed in another branch; no separate mail sent
6 years, 3 months
[xpra-codecs-freeworld/f27: 8/8] Merge branch 'master' into f27
by Antonio
commit 1fbbc6954b92a60224ef20e0288f7c00e91335d9
Merge: 605214a d2a41bd
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Mon Feb 5 17:02:42 2018 +0100
Merge branch 'master' into f27
.gitignore | 2 +
sources | 2 +-
xpra-codecs-freeworld-ffmpeg35.patch | 189 +++++++++++++++++++++++++++++++++++
xpra-codecs-freeworld.spec | 18 +++-
4 files changed, 209 insertions(+), 2 deletions(-)
---
diff --cc xpra-codecs-freeworld.spec
index 13481a4,21d710a..38c0bd2
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@@ -50,7 -55,10 +55,11 @@@ x264 and ffmpeg
%prep
%setup -q -n xpra-%{version}
+
+ %if 0%{?fedora} > 27
+ %patch0 -p1
+ %endif
+
%build
CFLAGS="%{optflags}" %{__python2} setup.py build --executable="%{__python2} -s" \
%{?_with_enc_x264} \
6 years, 3 months
[xpra-codecs-freeworld/f27] (8 commits) ...Merge branch 'master' into f27
by Antonio
Summary of changes:
5accc57... Update to 2.2 (*)
66f631c... Update to 2.2.1 (*)
d8426fc... Mass rebuild for x264 and x265 (*)
87ba42f... Update to 2.2.2 (*)
8a53532... Rebuilt for ffmpeg-3.5 git (*)
d22a51d... Update to 2.2.3 (*)
d2a41bd... Patched for ffmpeg-3.5 (*)
1fbbc69... Merge branch 'master' into f27
(*) This commit already existed in another branch; no separate mail sent
6 years, 3 months
[mixxx] add br upower-devel
by Leigh Scott
commit 3235e3ee93d54acca3badbd0f3e231e835d16779
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Feb 5 14:07:03 2018 +0000
add br upower-devel
mixxx.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/mixxx.spec b/mixxx.spec
index e09d445..9faf4f7 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -44,6 +44,7 @@ BuildRequires: flac-devel
BuildRequires: sqlite-devel
BuildRequires: rubberband-devel
BuildRequires: libchromaprint-devel
+BuildRequires: upower-devel
#Optionals Requirements
BuildRequires: libshout-devel
@@ -126,6 +127,7 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
%changelog
* Mon Feb 05 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.1.0-0.1.20180204git22f78d2
- Update to 2.1 snapshot
+- Add build requires upower-devel
* Sat Dec 16 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.0-12
- Rebuild for new protobuf .so version (f28)
6 years, 3 months
[mixxx] rename patch
by Leigh Scott
commit a29bc45f944e47fbfa2b5bc8a1534180652d2ba0
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Feb 5 13:10:48 2018 +0000
rename patch
mixxx-2.1.0-build.patch | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
---
diff --git a/mixxx-2.1.0-build.patch b/mixxx-2.1.0-build.patch
new file mode 100644
index 0000000..332b2a4
--- /dev/null
+++ b/mixxx-2.1.0-build.patch
@@ -0,0 +1,32 @@
+--- a/build/mixxx.py
++++ b/build/mixxx.py
+@@ -174,7 +174,7 @@
+
+ # Validate the specified qtdir exists
+ if not os.path.isdir(qtdir):
+- logging.error("QT path does not exist or QT4 is not installed.")
++ logging.error("QT path (%s) does not exist or QT4 is not installed." % qtdir)
+ logging.error(
+ "Please specify your QT path by running 'scons qtdir=[path]'")
+ Script.Exit(1)
+@@ -385,7 +385,7 @@
+ if 'CC' in os.environ:
+ self.env['CC'] = os.environ['CC']
+ if 'CFLAGS' in os.environ:
+- self.env['CFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
++ self.env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
+ if 'CXX' in os.environ:
+ self.env['CXX'] = os.environ['CXX']
+ if 'CXXFLAGS' in os.environ:
+
+--- a/build/depends.py
++++ b/build/depends.py
+@@ -427,7 +427,6 @@
+ qtdir = build.env['QTDIR']
+ framework_path = Qt.find_framework_libdir(qtdir, qt5)
+ if os.path.isdir(framework_path):
+- build.env.Append(LINKFLAGS="-Wl,-rpath," + framework_path)
+ build.env.Append(LINKFLAGS="-L" + framework_path)
+
+ # Mixxx requires C++11 support. Windows enables C++11 features by
+
6 years, 3 months
[exfat-utils/el6: 5/5] Remove F27 Mass Rebuild changelog entry.
by Vasiliy Glazov
commit 3f5ad7b1bf9c370cf7c38a3ed2950eaa58946e6f
Author: Vasiliy Glazov <v.glazov(a)javad.com>
Date: Mon Feb 5 16:10:52 2018 +0300
Remove F27 Mass Rebuild changelog entry.
exfat-utils.spec | 3 ---
1 file changed, 3 deletions(-)
---
diff --git a/exfat-utils.spec b/exfat-utils.spec
index 8b2db00..c8d063c 100644
--- a/exfat-utils.spec
+++ b/exfat-utils.spec
@@ -37,9 +37,6 @@ ln -s %{_mandir}/man8/mkexfatfs.8.gz %{buildroot}/usr/share/man/man8/mkfs.exfat.
* Mon Feb 05 2018 Vasiliy N. Glazov <vascom2(a)gmail.com> - 1.2.8-1
- Update to 1.2.8
-* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 1.2.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
* Wed Jun 21 2017 Vasiliy N. Glazov <vascom2(a)gmail.com> - 1.2.7-1
- Update to 1.2.7
6 years, 3 months
[exfat-utils/el6: 4/5] Merge branch 'master' into el6
by Vasiliy Glazov
commit 70d882edc2f7dc9fbf5d342bb6be05206b2206d3
Merge: 5ec903e 4dc9e87
Author: Vasiliy Glazov <v.glazov(a)javad.com>
Date: Mon Feb 5 16:10:39 2018 +0300
Merge branch 'master' into el6
.gitignore | 1 +
exfat-utils.spec | 8 +++++++-
sources | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
---
6 years, 3 months
[exfat-utils/el7: 5/5] Remove F27 Mass Rebuild changelog entry.
by Vasiliy Glazov
commit b0f5723ca8500c163653c667f03b57e6f7432d51
Author: Vasiliy Glazov <v.glazov(a)javad.com>
Date: Mon Feb 5 16:10:26 2018 +0300
Remove F27 Mass Rebuild changelog entry.
exfat-utils.spec | 3 ---
1 file changed, 3 deletions(-)
---
diff --git a/exfat-utils.spec b/exfat-utils.spec
index 8b2db00..c8d063c 100644
--- a/exfat-utils.spec
+++ b/exfat-utils.spec
@@ -37,9 +37,6 @@ ln -s %{_mandir}/man8/mkexfatfs.8.gz %{buildroot}/usr/share/man/man8/mkfs.exfat.
* Mon Feb 05 2018 Vasiliy N. Glazov <vascom2(a)gmail.com> - 1.2.8-1
- Update to 1.2.8
-* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 1.2.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
* Wed Jun 21 2017 Vasiliy N. Glazov <vascom2(a)gmail.com> - 1.2.7-1
- Update to 1.2.7
6 years, 3 months
