[gpac] Use make macros
by Leigh Scott
commit 8f4fc77da56bf12aff12a6b13e9d94fc1a29294f
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sun Nov 25 13:52:58 2018 +0000
Use make macros
gpac.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/gpac.spec b/gpac.spec
index d264aa9..63077b4 100644
--- a/gpac.spec
+++ b/gpac.spec
@@ -125,8 +125,8 @@ rm -rf doc/ipmpx_syntax.bt.origine
#Avoid mess with setup.h
cp -p config.h include/gpac
-make %{?_smp_mflags} all
-make %{?_smp_mflags} sggen
+%{make_build} all
+%{make_build} sggen
## kwizart - build doxygen doc for devel
pushd doc
@@ -134,7 +134,7 @@ doxygen
popd
%install
-make DESTDIR=$RPM_BUILD_ROOT install install-lib INSTFLAGS="-p"
+%{make_install} install-lib
rm -rf $RPM_BUILD_ROOT%{_bindir}/%{osmo}
#Install generated sggen binaries
5 years, 12 months
[gpac] Drop f26 conditional
by Leigh Scott
commit c56c8248677727d4e60fb4189a2e2994337caa44
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sun Nov 25 13:47:29 2018 +0000
Drop f26 conditional
gpac.spec | 2 --
1 file changed, 2 deletions(-)
---
diff --git a/gpac.spec b/gpac.spec
index b05e138..d264aa9 100644
--- a/gpac.spec
+++ b/gpac.spec
@@ -100,9 +100,7 @@ Static library for gpac.
%prep
%setup -q
-%if 0%{?fedora} >= 26
%patch0 -p1
-%endif
%patch1 -p1
%patch2 -p1
rm -r extra_lib/
5 years, 12 months
[gpac] Drop osmo support
by Leigh Scott
commit 1afd4f6dcdf8d0fa3513b8d0261105570d43cf30
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sun Nov 25 13:45:48 2018 +0000
Drop osmo support
gpac.spec | 57 ---------------------------------------------------------
1 file changed, 57 deletions(-)
---
diff --git a/gpac.spec b/gpac.spec
index de3ee1d..b05e138 100644
--- a/gpac.spec
+++ b/gpac.spec
@@ -1,7 +1,6 @@
# Todo: - Add pkg-config support for libs detection.
# - Add pkg-config support generated form configure for gpac (same as ffmpeg).
# - Make it support swscaler enabled ffmpeg (at least test it - upstream).
-# - Debug Osmo4 (don't even work).
# - Submit and import patches upstream.
# - Fix unused-direct-shlib-dependency on libgpac
@@ -99,25 +98,6 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release}
%description devel-static
Static library for gpac.
-%{?_with_osmo:
-%package -n %{osmo}
-Summary: Media player based on gpac
-
-%description -n %{osmo}
-Osmo4 is an MPEG-4 player with the following features:
-* MPEG-4 Systems player
-* Optimized 2D graphics renderer compliant with the Complete2D Scene Graph
- and Graphics profiles
-* Video and audio presentation achieved through plugins
-* Multimedia player features:
- * Timeline controls: play, pause, step.
- * Graphics features: antialising, zoom and pan, scalable resizing of
- rendering area, basic full screen support.
- * Support for Advanced Text and Graphics extension of MPEG-4 Systems
- under standardization.
- * Frame export to JPG, PNG, BMP.
-}
-
%prep
%setup -q
%if 0%{?fedora} >= 26
@@ -157,35 +137,7 @@ popd
%install
make DESTDIR=$RPM_BUILD_ROOT install install-lib INSTFLAGS="-p"
-
-%{?_with_osmo:
-# Desktop menu Osmo4
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-cat > %{osmo}.desktop <<EOF
-[Desktop Entry]
-Name=Osmo4 Media Player
-GenericName=Media Player
-Comment=MPEG-4 Media Player
-Exec=%{osmo}
-Terminal=false
-Icon=%{osmo}
-Type=Application
-Encoding=UTF-8
-Categories=AudioVideo;Player;
-EOF
-
-desktop-file-install --vendor "" \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --mode 644 \
- %{osmo}.desktop
-
-#icons
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-install -pm 0644 applications/osmo4_wx/osmo4.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{osmo}.xpm
-}
-%{?!_with_osmo:
rm -rf $RPM_BUILD_ROOT%{_bindir}/%{osmo}
-}
#Install generated sggen binaries
#for b in MPEG4 SVG X3D; do
@@ -229,15 +181,6 @@ rm $RPM_BUILD_ROOT%{_includedir}/gpac/config.h
%{_libdir}/libgpac.so.*
%{_libdir}/gpac/
-%{?_with_osmo:
-%files -n %{osmo}
-%doc AUTHORS BUGS README TODO
-%lincense COPYING
-%{_bindir}/Osmo4
-%{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/%{osmo}.xpm
-}
-
%files doc
%doc doc/html-libgpac/*
5 years, 12 months
[gpac] Drop mozilla support
by Leigh Scott
commit 6f64c990683ffb3f6e3bc14aacb6d4c409d7f4c0
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sun Nov 25 13:40:52 2018 +0000
Drop mozilla support
gpac.spec | 64 +--------------------------------------------------------------
1 file changed, 1 insertion(+), 63 deletions(-)
---
diff --git a/gpac.spec b/gpac.spec
index e0ddd01..de3ee1d 100644
--- a/gpac.spec
+++ b/gpac.spec
@@ -1,5 +1,4 @@
-# Todo: - Patch-in xulrunner support within configure with pkg-config support.
-# - Add pkg-config support for libs detection.
+# Todo: - Add pkg-config support for libs detection.
# - Add pkg-config support generated form configure for gpac (same as ffmpeg).
# - Make it support swscaler enabled ffmpeg (at least test it - upstream).
# - Debug Osmo4 (don't even work).
@@ -8,11 +7,6 @@
%global osmo Osmo4
#global git 20150924
-# Mozilla stuff fails. It's completely disabled for now.
-%global mozver 3.0
-%global geckover 2.0.0
-%global xuldir %{_datadir}/idl/xulrunner-sdk-%{geckover}
-%global xulbindir %{_libdir}/xulrunner-%{geckover}
Name: gpac
Summary: MPEG-4 multimedia framework
@@ -57,7 +51,6 @@ BuildRequires: libXpm-devel
BuildRequires: libXv-devel
BuildRequires: wxGTK-devel
BuildRequires: xmlrpc-c-devel
-%{?_with_mozilla:BuildRequires: gecko-devel}
BuildRequires: doxygen graphviz
BuildRequires: desktop-file-utils
%{?_with_amr:BuildRequires: amrnb-devel
@@ -125,19 +118,6 @@ Osmo4 is an MPEG-4 player with the following features:
* Frame export to JPG, PNG, BMP.
}
-%{?_with_mozilla:
-%package -n mozilla-%{osmo}
-Summary: Osmo Media Player plugin for Mozilla compatible web browsers
-Requires: %{osmo} = %{version}-%{release}
-#Requires: firefox >= %{mozver}
-Requires: %{_libdir}/mozilla
-
-
-%description -n mozilla-%{osmo}
-This package contains the OSMO Media Player plugin for Mozilla compatible
-web browsers.
-}
-
%prep
%setup -q
%if 0%{?fedora} >= 26
@@ -160,7 +140,6 @@ rm -rf doc/ipmpx_syntax.bt.origine
--X11-path=%{_prefix} \
--libdir=%{_lib} \
--disable-oss-audio \
-%{?_with_mozilla:--mozdir=%{_libdir}/mozilla/plugins} \
%{?_with_amr:--enable-amr} \
--disable-static \
--use-js=no
@@ -168,34 +147,6 @@ rm -rf doc/ipmpx_syntax.bt.origine
#Avoid mess with setup.h
cp -p config.h include/gpac
-##
-## Osmo-zila plugin.
-##
-%{?_with_mozilla:
-#
-# Rebuild osmozilla.xpt
-pushd applications/osmozilla
-%{xulbindir}/xpidl -m header -I%{xuldir}/stable -I%{xuldir}/unstable nsIOsmozilla.idl
-%{xulbindir}/xpidl -m typelib -I%{xuldir}/stable -I%{xuldir}/unstable nsIOsmozilla.idl
-%{xulbindir}/xpt_link nposmozilla.xpt nsIOsmozilla.xpt
-mv nsIOsmozilla.xpt nsIOsmozilla.xpt_linux
-popd
-
-## kwizart - osmozilla parallel make fails
-# %{?_smp_mflags}
-#make -C applications/osmozilla \
-# OPTFLAGS="%optflags -fPIC -I%{_includedir}/nspr4/" \
-# INCLUDES="-I%{_datadir}/idl/firefox-%{mozver}/ \
-# -I%{_includedir}/firefox-%{mozver}/ \
-# -I%{_includedir}/firefox-%{mozver}/xpcom \
-# -I%{_includedir}/nspr4/ $INCLUDES" \
-# XPIDL_INCL="-I%{_datadir}/idl/firefox-%{mozver}/ \
-# -I%{_includedir}/firefox-%{mozver}/ \
-# -I%{_includedir}/firefox-%{mozver}/xpcom \
-# -I%{_includedir}/nspr4/ $INCLUDES" \
-# install
-}
-
make %{?_smp_mflags} all
make %{?_smp_mflags} sggen
@@ -207,13 +158,6 @@ popd
%install
make DESTDIR=$RPM_BUILD_ROOT install install-lib INSTFLAGS="-p"
-%{?_with_mozilla:
-## kwizart - Install osmozilla plugin - make instmoz disabled.
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/mozilla/{plugins,components}
-install -m 755 bin/gcc/nposmozilla.so $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/nposmozilla.so
-install -m 755 bin/gcc/nposmozilla.xpt $RPM_BUILD_ROOT%{_libdir}/mozilla/components/nposmozilla.xpt
-}
-
%{?_with_osmo:
# Desktop menu Osmo4
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -294,12 +238,6 @@ rm $RPM_BUILD_ROOT%{_includedir}/gpac/config.h
%{_datadir}/pixmaps/%{osmo}.xpm
}
-%{?_with_mozilla:
-%files -n mozilla-%{osmo}
-%{_libdir}/mozilla/plugins/nposmozilla.so
-%{_libdir}/mozilla/components/nposmozilla.xpt
-}
-
%files doc
%doc doc/html-libgpac/*
5 years, 12 months
[gpac] Use one BuildRequires per line
by Leigh Scott
commit d21773a23927e6572083df99dd08100f508591de
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sun Nov 25 13:36:15 2018 +0000
Use one BuildRequires per line
gpac.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/gpac.spec b/gpac.spec
index 2a71f66..e0ddd01 100644
--- a/gpac.spec
+++ b/gpac.spec
@@ -49,7 +49,9 @@ BuildRequires: openssl-devel
BuildRequires: openjpeg-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: zlib-devel
-BuildRequires: libogg-devel libvorbis-devel libtheora-devel
+BuildRequires: libogg-devel
+BuildRequires: libvorbis-devel
+BuildRequires: libtheora-devel
BuildRequires: libXt-devel
BuildRequires: libXpm-devel
BuildRequires: libXv-devel
@@ -58,7 +60,8 @@ BuildRequires: xmlrpc-c-devel
%{?_with_mozilla:BuildRequires: gecko-devel}
BuildRequires: doxygen graphviz
BuildRequires: desktop-file-utils
-%{?_with_amr:BuildRequires: amrnb-devel amrwb-devel}
+%{?_with_amr:BuildRequires: amrnb-devel
+BuildRequires: amrwb-devel}
BuildRequires: gtk+-devel
BuildRequires: gtk2-devel
5 years, 12 months
[gpac] Add missing isa on Requires
by Leigh Scott
commit e5954c72bff69475eda6dda8dcad52e1eabe6c71
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sun Nov 25 13:28:55 2018 +0000
Add missing isa on Requires
gpac.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gpac.spec b/gpac.spec
index 0ca1295..2a71f66 100644
--- a/gpac.spec
+++ b/gpac.spec
@@ -82,7 +82,7 @@ The %{name}-libs package contains library for %{name}.
%package devel
Summary: Development libraries and files for %{name}
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description devel
Development libraries and files for gpac.
@@ -97,7 +97,7 @@ Documentation for %{name}.
%package devel-static
Summary: Development libraries and files for %{name}
-Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}-devel%{?_isa} = %{version}-%{release}
%description devel-static
5 years, 12 months
[gpac] Remove Group tag
by Leigh Scott
commit 6dd2cd99a691da3388c30a5c0e031c9bde6f4e29
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sun Nov 25 13:26:32 2018 +0000
Remove Group tag
gpac.spec | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
---
diff --git a/gpac.spec b/gpac.spec
index 1f0e30b..0ca1295 100644
--- a/gpac.spec
+++ b/gpac.spec
@@ -19,7 +19,6 @@ Summary: MPEG-4 multimedia framework
Version: 0.7.1
Release: 6%{?git:.%{git}git}%{?dist}
License: LGPLv2+
-Group: System Environment/Libraries
URL: http://gpac.sourceforge.net/
Source0: https://github.com/gpac/gpac/archive/v%{version}/gpac-%{version}.tar.gz
# https://github.com/openssl/openssl/issues/1543
@@ -76,7 +75,6 @@ for MP4 and 3GPP(2) files and many tools for scene descriptions
%package libs
Summary: Library for %{name}
-Group: System Environment/Libraries
%description libs
The %{name}-libs package contains library for %{name}.
@@ -84,7 +82,6 @@ The %{name}-libs package contains library for %{name}.
%package devel
Summary: Development libraries and files for %{name}
-Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
%description devel
@@ -93,7 +90,6 @@ Development libraries and files for gpac.
%package doc
Summary: Documentation for %{name}
-Group: Documentation
%description doc
Documentation for %{name}.
@@ -101,7 +97,6 @@ Documentation for %{name}.
%package devel-static
Summary: Development libraries and files for %{name}
-Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
@@ -111,7 +106,6 @@ Static library for gpac.
%{?_with_osmo:
%package -n %{osmo}
Summary: Media player based on gpac
-Group: Applications/Multimedia
%description -n %{osmo}
Osmo4 is an MPEG-4 player with the following features:
@@ -130,8 +124,7 @@ Osmo4 is an MPEG-4 player with the following features:
%{?_with_mozilla:
%package -n mozilla-%{osmo}
-Summary: Osmo Media Player plugin for Mozilla compatible web browsers
-Group: Applications/Multimedia
+Summary: Osmo Media Player plugin for Mozilla compatible web browsers
Requires: %{osmo} = %{version}-%{release}
#Requires: firefox >= %{mozver}
Requires: %{_libdir}/mozilla
5 years, 12 months
[xroar/f28] Updated to 0.35.1
by Andrea Musuruane
Summary of changes:
d95d3c8... Updated to 0.35.1 (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 12 months
[xroar/f29] Updated to 0.35.1
by Andrea Musuruane
Summary of changes:
d95d3c8... Updated to 0.35.1 (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 12 months
[kodi/f29] Kodi 18.0 RC1
by Michael Cronenworth
Summary of changes:
aa6b026... Kodi 18.0 RC1 (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 12 months
