[mythtv] (19 commits) ...Merge branch 'master' into el7
by Sérgio M. Basto
Summary of changes:
feb5fbc... * Mon Jan 6 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.2 (*)
1e5e21a... * Tue Mar 11 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.2 (*)
d3b9c6b... * Wed May 7 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.2 (*)
c599b56... Add patch for arm build fix. (*)
4a90940... * Mon May 26 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.2 (*)
cc32beb... * Sun Jul 27 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.2 (*)
ffc8559... * Sun Jul 27 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.2 (*)
6fe3d0c... * Mon Oct 13 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.2 (*)
34695f8... Fix systemd conditional in spec file. (*)
3374b6a... * Mon Nov 3 2014 Richard Shaw <hobbes1069(a)gmail.com> - 0.2 (*)
c4242de... * Sun Jan 4 2015 Richard Shaw <hobbes1069(a)gmail.com> - 0.2 (*)
64ec016... * Tue Apr 7 2015 Richard Shaw <hobbes1069(a)gmail.com> - 0.2 (*)
ef04ef6... * Tue May 26 2015 Richard Shaw <hobbes1069(a)gmail.com> - 0.2 (*)
5935dff... Merge master into el7 (*)
b6f6c3a... Merge master into el7 (*)
df26485... Merge remote-tracking branch 'origin/master' into el7 (*)
9519ac4... Merge branch 'master' into el7 (*)
d109644... Merge branch 'master' into el7 (*)
742320f... Merge branch 'master' into el7 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 3 months
[mythtv/el7: 10/10] Merge branch 'master' into el7
by Sérgio M. Basto
commit 742320fe8dd3a3300d72cb590ded41f3328445d0
Merge: d109644 050734b
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Jan 20 18:21:54 2018 +0000
Merge branch 'master' into el7
.gitignore | 1 +
ChangeLog | 64 +
latest_fixes.sh | 15 +
mythtv-fixes.patch | 22788 -------------------------------------------------
mythtv-mariadb.patch | 12 -
mythtv-qmake.patch | 115 -
mythtv.spec | 57 +-
sources | 2 +-
update_fixes.sh | 22 +-
9 files changed, 134 insertions(+), 22942 deletions(-)
---
6 years, 3 months
[mythtv/el7] (10 commits) ...Merge branch 'master' into el7
by Sérgio M. Basto
Summary of changes:
93119ab... rebuilt (*)
9c1bba5... Update to v29.0-77-g771115f47d from branch fixes/29 (*)
020f1b9... Update to v29.0-77-g771115f47d from branch fixes/29 (*)
5658e7a... Update to v29.0-77-g771115f47d from branch fixes/29 (*)
becb551... Fix git hash variables for %%setup. (*)
c74c243... Update updates_fixes.sh with more ideas :) (*)
4fc8480... Update ChangeLog (*)
818832e... fix rfbz #4684, Use mariadb-connector-c-devel instead of my (*)
050734b... Small improvements (*)
742320f... Merge branch 'master' into el7
(*) This commit already existed in another branch; no separate mail sent
6 years, 3 months
[mythtv/f26] (3 commits) ...Small improvements
by Sérgio M. Basto
Summary of changes:
4fc8480... Update ChangeLog (*)
818832e... fix rfbz #4684, Use mariadb-connector-c-devel instead of my (*)
050734b... Small improvements (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 3 months
[mythtv/f27] (3 commits) ...Small improvements
by Sérgio M. Basto
Summary of changes:
4fc8480... Update ChangeLog (*)
818832e... fix rfbz #4684, Use mariadb-connector-c-devel instead of my (*)
050734b... Small improvements (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 3 months
[zoneminder] fix build with ffmpeg-3.5
by Leigh Scott
commit ce8fb61fe9af4611a3ce5a271631b9b1077e2ecc
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Jan 20 11:16:00 2018 +0000
fix build with ffmpeg-3.5
ffmpeg35_buildfix.patch | 50 +++++++++++++++++++++++++++++++++++++++++++++++++
zoneminder.spec | 1 +
2 files changed, 51 insertions(+)
---
diff --git a/ffmpeg35_buildfix.patch b/ffmpeg35_buildfix.patch
new file mode 100644
index 0000000..3d0df42
--- /dev/null
+++ b/ffmpeg35_buildfix.patch
@@ -0,0 +1,50 @@
+--- a/src/zm_mpeg.cpp
++++ b/src/zm_mpeg.cpp
+@@ -29,6 +29,7 @@
+ {
+ #include <libavutil/mathematics.h>
+ #include <libavcodec/avcodec.h>
++#define AVFMT_RAWPICTURE 0x0020
+ }
+
+ bool VideoStream::initialised = false;
+@@ -240,7 +241,7 @@
+ {
+ // Quality based bitrate control (VBR). Scale is 1..31 where 1 is best.
+ // This gets rid of artifacts in the beginning of the movie; and well, even quality.
+- c->flags |= CODEC_FLAG_QSCALE;
++ c->flags |= AV_CODEC_FLAG_QSCALE;
+ c->global_quality = FF_QP2LAMBDA * (31 - (31 * (bitrate / 100.0)));
+ }
+ else
+@@ -265,7 +266,7 @@
+
+ // some formats want stream headers to be separate
+ if ( of->flags & AVFMT_GLOBALHEADER )
+- c->flags |= CODEC_FLAG_GLOBAL_HEADER;
++ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+ }
+ else
+ {
+
+--- a/src/zm_sdp.cpp
++++ b/src/zm_sdp.cpp
+@@ -483,7 +483,7 @@
+ uint8_t *dest =
+ (uint8_t *)av_malloc(packet_size + sizeof(start_sequence) +
+ stream->codec->extradata_size +
+- FF_INPUT_BUFFER_PADDING_SIZE);
++ AV_INPUT_BUFFER_PADDING_SIZE);
+ if(dest) {
+ if(stream->codec->extradata_size) {
+ // av_realloc?
+@@ -494,7 +494,7 @@
+ memcpy(dest+stream->codec->extradata_size, start_sequence, sizeof(start_sequence));
+ memcpy(dest+stream->codec->extradata_size+sizeof(start_sequence), decoded_packet, packet_size);
+ memset(dest+stream->codec->extradata_size+sizeof(start_sequence)+
+- packet_size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
++ packet_size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
+
+ stream->codec->extradata= dest;
+ stream->codec->extradata_size+= sizeof(start_sequence)+packet_size;
+
diff --git a/zoneminder.spec b/zoneminder.spec
index 2e34f3f..0f93ba6 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -50,6 +50,7 @@ Source1: https://github.com/FriendsOfCake/crud/archive/v%{crud_version}.tar.gz#/
Patch0: zoneminder-ftbsf27.patch
Patch1: zoneminder-distropatternmatch.patch
Patch2: zoneminder-apacheconfig.patch
+Patch3: ffmpeg35_buildfix.patch
%{?with_init_systemd:BuildRequires: systemd-devel}
%{?with_init_systemd:BuildRequires: mariadb-devel}
6 years, 3 months
[lives] Refresh original patch
by Antonio
commit f0c17294e41d007a6fd848495bf2ff36f01227ea
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Sat Jan 20 12:07:48 2018 +0100
Refresh original patch
lives-ffmpeg35_buildfix.patch | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/lives-ffmpeg35_buildfix.patch b/lives-ffmpeg35_buildfix.patch
index 6beefb5..9be72a1 100644
--- a/lives-ffmpeg35_buildfix.patch
+++ b/lives-ffmpeg35_buildfix.patch
@@ -184,7 +184,7 @@
get_samps_and_signed(cc->sample_fmt, &cdata->asamps, &cdata->asigned);
- sprintf(cdata->audio_name, "%s", cc->codec_name);
-+ sprintf(cdata->audio_name, "%s", cc->codec_type);
++ sprintf(cdata->audio_name, "%s", avcodec_get_name(cc->codec_id));
priv->astream = i;
break;
@@ -193,7 +193,7 @@
}
- sprintf(cdata->video_name, "%s", cc->codec_name);
-+ sprintf(cdata->video_name, "%s", cc->codec_type);
++ sprintf(cdata->video_name, "%s", avcodec_get_name(cc->codec_id));
cdata->par = cc->sample_aspect_ratio.num / cc->sample_aspect_ratio.den;
if (cdata->par == 0) cdata->par = 1;
6 years, 3 months
[lives] Rename patch for ffmpeg-3.5 and applied on fedora 28+
by Antonio
commit 67467e11a857760a3a63538f4df8cf6f9ed07af9
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Sat Jan 20 11:44:03 2018 +0100
Rename patch for ffmpeg-3.5 and applied on fedora 28+
ffmpeg35_buildfix.patch => lives-ffmpeg35_buildfix.patch | 4 ++--
lives.spec | 13 +++++++++----
2 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/ffmpeg35_buildfix.patch b/lives-ffmpeg35_buildfix.patch
similarity index 98%
rename from ffmpeg35_buildfix.patch
rename to lives-ffmpeg35_buildfix.patch
index 9be72a1..6beefb5 100644
--- a/ffmpeg35_buildfix.patch
+++ b/lives-ffmpeg35_buildfix.patch
@@ -184,7 +184,7 @@
get_samps_and_signed(cc->sample_fmt, &cdata->asamps, &cdata->asigned);
- sprintf(cdata->audio_name, "%s", cc->codec_name);
-+ sprintf(cdata->audio_name, "%s", avcodec_get_name(cc->codec_id));
++ sprintf(cdata->audio_name, "%s", cc->codec_type);
priv->astream = i;
break;
@@ -193,7 +193,7 @@
}
- sprintf(cdata->video_name, "%s", cc->codec_name);
-+ sprintf(cdata->video_name, "%s", avcodec_get_name(cc->codec_id));
++ sprintf(cdata->video_name, "%s", cc->codec_type);
cdata->par = cc->sample_aspect_ratio.num / cc->sample_aspect_ratio.den;
if (cdata->par == 0) cdata->par = 1;
diff --git a/lives.spec b/lives.spec
index 9b6d0f3..256313c 100644
--- a/lives.spec
+++ b/lives.spec
@@ -13,14 +13,14 @@
Name: lives
Version: 2.8.7
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Video editor and VJ tool
License: GPLv3+ and LGPLv3+
URL: http://lives-video.com
Source0: http://lives-video.com/releases/LiVES-%{version}.tar.bz2
## Appdata file
Source1: LiVES.appdata.xml
-Patch0: ffmpeg35_buildfix.patch
+Patch0: %{name}-ffmpeg35_buildfix.patch
BuildRequires: pkgconfig(jack)
BuildRequires: pkgconfig(sdl)
@@ -45,6 +45,7 @@ BuildRequires: pkgconfig(fftw3)
#BuildRequires: pkgconfig(libvisual-0.4)
BuildRequires: pkgconfig(libmatroska)
BuildRequires: pkgconfig(mjpegtools)
+BuildRequires: pkgconfig(libprojectM)
BuildRequires: ladspa-devel
BuildRequires: x264-libs
BuildRequires: gettext-devel
@@ -60,7 +61,6 @@ BuildRequires: gcc-c++
BuildRequires: perl-generators
BuildRequires: python2-devel
BuildRequires: python3-devel
-BuildRequires: libprojectM-devel
# Packages for re-configuration
BuildRequires: autoconf, automake, libtool
@@ -94,7 +94,9 @@ It is small in size, yet it has many advanced features.
%prep
%setup -q -n lives-%{version}
+%if 0%{?fedora} > 27
%patch0 -p1
+%endif
##Remove spurious executable permissions
for i in `find . -type f \( -name "*.c" -o -name "*.h" -o -name "*.txt" \)`; do
@@ -104,7 +106,7 @@ done
%build
%configure --disable-silent-rules --enable-shared --enable-static \
--enable-largefile --enable-threads --disable-rpath --enable-profiling \
- --enable-doxygen
+ --enable-doxygen --disable-libvisual --enable-projectM
%make_build CPPFLAGS=-I%{_includedir}/tirpc LIBS="-ltirpc -ldl"
@@ -187,6 +189,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.
%{_datadir}/appdata/LiVES.appdata.xml
%changelog
+* Sat Jan 20 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 2.8.7.9
+- Rename patch for ffmpeg-3.5 and applied on fedora 28+
+
* Sat Jan 20 2018 Meu Nome <eu(a)exemplo.com> - 2.8.7-8
- Enable libprojectM
6 years, 3 months
[lives] Enable libprojectM
by Sérgio M. Basto
commit 362d49aafb7fea9d0792359096959726fb855b94
Author: Meu Nome <eu(a)exemplo.com>
Date: Sat Jan 20 03:28:59 2018 +0000
Enable libprojectM
lives.spec | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/lives.spec b/lives.spec
index 0166270..9b6d0f3 100644
--- a/lives.spec
+++ b/lives.spec
@@ -13,7 +13,7 @@
Name: lives
Version: 2.8.7
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Video editor and VJ tool
License: GPLv3+ and LGPLv3+
URL: http://lives-video.com
@@ -60,6 +60,7 @@ BuildRequires: gcc-c++
BuildRequires: perl-generators
BuildRequires: python2-devel
BuildRequires: python3-devel
+BuildRequires: libprojectM-devel
# Packages for re-configuration
BuildRequires: autoconf, automake, libtool
@@ -103,7 +104,7 @@ done
%build
%configure --disable-silent-rules --enable-shared --enable-static \
--enable-largefile --enable-threads --disable-rpath --enable-profiling \
- --enable-doxygen --disable-libvisual --disable-projectM
+ --enable-doxygen
%make_build CPPFLAGS=-I%{_includedir}/tirpc LIBS="-ltirpc -ldl"
@@ -186,6 +187,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.
%{_datadir}/appdata/LiVES.appdata.xml
%changelog
+* Sat Jan 20 2018 Meu Nome <eu(a)exemplo.com> - 2.8.7-8
+- Enable libprojectM
+
* Fri Jan 19 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.8.7-7
- Add build fix for ffmpeg-3.5 git
6 years, 3 months
[mythtv] Small improvements
by Sérgio M. Basto
commit 050734b3a1f7c3745b8cc2a85f6d29b98a525e55
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Jan 20 02:30:09 2018 +0000
Small improvements
mythtv.spec | 2 +-
update_fixes.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/mythtv.spec b/mythtv.spec
index e60a799..0d94f9c 100644
--- a/mythtv.spec
+++ b/mythtv.spec
@@ -15,7 +15,7 @@
#
# The latest RPM Fusion version can be found at:
#
-# http://cvs.rpmfusion.org/viewvc/rpms/mythtv/devel/?root=free
+# https://pkgs.rpmfusion.org/cgit/free/mythtv.git/
#
# Note:
#
diff --git a/update_fixes.sh b/update_fixes.sh
index 586a8c1..1443c27 100755
--- a/update_fixes.sh
+++ b/update_fixes.sh
@@ -20,7 +20,7 @@ spectool -g mythtv.spec
echo Press enter to run: rfpkg new-sources mythtv-${version}-${shorthash}.tar.gz; read dummy;
rfpkg new-sources mythtv-${version}-${shorthash}.tar.gz
echo Press enter to continue; read dummy;
-rfpkg clog && rfpkg commit -F clog && /bin/rm clog && git show
+rfpkg clog && rfpkg ci -c && git show
echo Press enter to continue; read dummy;
rfpkg push && rfpkg build --nowait
echo Press enter to continue; read dummy;
6 years, 3 months