Packman Build Service PMBS

libx264-x264.spec Changed

@@ -18,8 +18,9 @@
 
 %define soname  148
 %define svn     20161219
+%bcond_without  gpac
 ##### WARNING: please do not edit this auto generated spec file. Use the libx264.spec! #####
-%bcond_without binary
+%bcond_without  x264_binary
 Name:           libx264-x264
 Version:        0.%{soname}svn%{svn}
 Release:        0
@@ -34,8 +35,12 @@
 BuildRequires:  pkgconfig
 BuildRequires:  yasm >= 1.2.0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if %{with binary}
+%if %{with x264_binary}
+Provides:       x264 = %{version}-%{release}
+Obsoletes:      x264 < %{version}-%{release}
+%if %{with gpac}
 BuildRequires:  libgpac-devel
+%endif
 BuildRequires:  pkgconfig(ffms2)
 BuildRequires:  pkgconfig(libavcodec)
 BuildRequires:  pkgconfig(libavformat)
@@ -123,12 +128,16 @@
   --disable-lsmash \
   --disable-opencl \
   --enable-shared \
-%if %{with binary}
+%if %{with x264_binary}
   --enable-swscale \
   --enable-lavf \
   --enable-ffms \
+%if %{with gpac}
   --enable-gpac \
 %else
+  --disable-gpac \
+%endif
+%else
   --disable-cli \
   --disable-swscale \
   --disable-lavf \
@@ -139,8 +148,8 @@
 make %{?_smp_mflags}
 
 %install
-%if %{with binary}
-install -Dm 755 x264 %{buildroot}/%{_bindir}
+%if %{with x264_binary}
+install -Dm 755 x264 %{buildroot}/%{_bindir}/x264
 %else
 make %{?_smp_mflags} DESTDIR=%{buildroot} install
 
@@ -149,7 +158,7 @@
 ln -s %{name}.so.%{soname} %{buildroot}%{_libdir}/%{name}.so
 %endif
 
-%if %{with binary}
+%if %{with x264_binary}
 %files -n x264
 %defattr(-,root,root)
 %doc doc/*.txt

libx264.spec Changed

@@ -18,7 +18,8 @@
 
 %define soname  148
 %define svn     20161219
-%bcond_with binary
+%bcond_without  gpac
+%bcond_with     x264_binary
 Name:           libx264
 Version:        0.%{soname}svn%{svn}
 Release:        0
@@ -33,8 +34,12 @@
 BuildRequires:  pkgconfig
 BuildRequires:  yasm >= 1.2.0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if %{with binary}
+%if %{with x264_binary}
+Provides:       x264 = %{version}-%{release}
+Obsoletes:      x264 < %{version}-%{release}
+%if %{with gpac}
 BuildRequires:  libgpac-devel
+%endif
 BuildRequires:  pkgconfig(ffms2)
 BuildRequires:  pkgconfig(libavcodec)
 BuildRequires:  pkgconfig(libavformat)
@@ -122,12 +127,16 @@
   --disable-lsmash \
   --disable-opencl \
   --enable-shared \
-%if %{with binary}
+%if %{with x264_binary}
   --enable-swscale \
   --enable-lavf \
   --enable-ffms \
+%if %{with gpac}
   --enable-gpac \
 %else
+  --disable-gpac \
+%endif
+%else
   --disable-cli \
   --disable-swscale \
   --disable-lavf \
@@ -138,8 +147,8 @@
 make %{?_smp_mflags}
 
 %install
-%if %{with binary}
-install -Dm 755 x264 %{buildroot}/%{_bindir}
+%if %{with x264_binary}
+install -Dm 755 x264 %{buildroot}/%{_bindir}/x264
 %else
 make %{?_smp_mflags} DESTDIR=%{buildroot} install
 
@@ -148,7 +157,7 @@
 ln -s %{name}.so.%{soname} %{buildroot}%{_libdir}/%{name}.so
 %endif
 
-%if %{with binary}
+%if %{with x264_binary}
 %files -n x264
 %defattr(-,root,root)
 %doc doc/*.txt

pre_checkin.sh Changed

Changes of Revision 16