Request 6 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Overview

Request 6 (accepted)

update version 20130723

Created by marguerite over 11 years ago
In state accepted

Submit libx264

Submit package home:marguerite...ches:Essentials / libx264 to package Essentials / libx264

libx264.changes Changed

libx264.spec Changed

@@ -1,5 +1,6 @@
 # vim: set ts=4 sw=4 et:
 # Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>
+# COpyright (c) 2013 Marguerite Su <marguerite@opensuse.org>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -10,20 +11,19 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.links2linux.org/
 
 Name:           libx264
-%define libname %{name}
-%define soname  129
-%define svn     20130224
+%define soname  135
+%define svn     20130723
 Version:        0.%{soname}svn%{svn}
 Release:        1
 License:        GPL-2.0+
 Summary:        A free h264/avc encoder - encoder binary
 Url:            http://developers.videolan.org/x264.html
 Group:          Productivity/Multimedia/Video/Editors and Convertors
-Source0:        ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-%{svn}-2245.tar.bz2
-Patch0:         x264-use-shared-library.patch
+Source:        ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-%{svn}-2245.tar.bz2
+Patch:         x264-use-shared-library.patch
 BuildRequires:  nasm
 BuildRequires:  pkg-config
 BuildRequires:  yasm >= 1.2.0
@@ -59,11 +59,11 @@
 moment so please use mencoder or another tool that supports x264 library
 for all other file types.
 
-%package -n %{libname}-%{soname}
+%package %{soname}
 Summary:        A free h264/avc encoder - encoder binary
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 
-%description -n %{libname}-%{soname}
+%description %{soname}
 x264 is a free library for encoding next-generation H264/AVC video
 streams. The code is written from scratch by Laurent Aimar, Loren
 Merritt, Eric Petit (OS X), Min Chen (vfw/asm), Justin Clay (vfw), Mans
@@ -73,15 +73,14 @@
 development with libx264. This library is needed to build
 mplayer/mencoder with H264 encoding support.
 
-%package -n %{libname}-devel
+%package devel
 Summary:        Libraries and include file for the %{name} encoder
 Group:          Development/Libraries/C and C++
-Requires:       %{buildrequires}
-Requires:       %{libname}-%{soname} = %{version}
-Provides:       %{name}-devel = %{version}
-Obsoletes:      %{name}-devel < %{version}
+Requires:       %{name}-%{soname} = %{version}
+Provides:       x264-devel = %{version}
+Obsoletes:      x264-devel < %{version}
 
-%description -n %{libname}-devel
+%description devel
 x264 is a free library for encoding next-generation H264/AVC video
 streams. The code is written from scratch by Laurent Aimar, Loren
 Merritt, Eric Petit (OS X), Min Chen (vfw/asm), Justin Clay (vfw), Mans
@@ -92,8 +91,8 @@
 mplayer/mencoder with H264 encoding support.
 
 %prep
-%setup -q -n "x264-snapshot-%{svn}-2245"
-%patch0 -p0
+%setup -q -n x264-snapshot-%{svn}-2245
+%patch -p1
 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
 sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" x264.c
 
@@ -104,29 +103,26 @@
 %install
 %makeinstall
 
-rm -f "%{buildroot}%{_libdir}/%{libname}.so"
-rm -f "%{buildroot}%{_libdir}/%{libname}.a"
-ln -s %{libname}.so.%{soname} "%{buildroot}%{_libdir}/%{libname}.so"
+rm -f %{buildroot}%{_libdir}/%{name}.so
+rm -f %{buildroot}%{_libdir}/%{name}.a
+ln -s %{name}.so.%{soname} %{buildroot}%{_libdir}/%{name}.so
 
-rm "%{buildroot}%{_bindir}"/*
+rm %{buildroot}%{_bindir}/*
 
-echo "%{libname}-%{soname}" > %{_sourcedir}/baselibs.conf
+echo "%{name}-%{soname}" > %{_sourcedir}/baselibs.conf
 
-%clean
-%{?buildroot:%__rm -rf "%{buildroot}"}
+%post -n %{name}-%{soname} -p /sbin/ldconfig
+%postun -n %{name}-%{soname} -p /sbin/ldconfig
 
-%post -n %{libname}-%{soname} -p /sbin/ldconfig
-%postun -n %{libname}-%{soname} -p /sbin/ldconfig
-
-%files -n %{libname}-%{soname}
+%files %{soname}
 %defattr(0644,root,root)
-%{_libdir}/%{libname}.so.%{soname}
+%{_libdir}/%{name}.so.%{soname}
 
-%files -n %{libname}-devel
+%files devel
 %defattr(0644,root,root)
 %{_includedir}/x264.h
 %{_includedir}/x264_config.h
 %{_libdir}/pkgconfig/x264.pc
-%{_libdir}/%{libname}.so
+%{_libdir}/%{name}.so
 
 %changelog

x264-use-shared-library.patch Changed

@@ -1,21 +1,23 @@
---- Makefile.orig	2011-12-26 22:45:03.000000000 +0100
-+++ Makefile	2011-12-27 20:03:46.070404383 +0100
-@@ -152,6 +152,7 @@
+Index: x264-snapshot-20130723-2245/Makefile
+===================================================================
+--- x264-snapshot-20130723-2245.orig/Makefile
++++ x264-snapshot-20130723-2245/Makefile
+@@ -171,6 +171,7 @@ $(LIBX264): $(GENERATED) .depend $(OBJS)
  
- $(SONAME): .depend $(OBJS) $(OBJASM) $(OBJSO)
+ $(SONAME): $(GENERATED) .depend $(OBJS) $(OBJASM) $(OBJSO)
  	$(LD)$@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
 +	ln -s $(SONAME) libx264.so
  
  ifneq ($(EXE),)
  .PHONY: x264 checkasm
-@@ -159,8 +160,8 @@
+@@ -178,8 +179,8 @@ x264: x264$(EXE)
  checkasm: checkasm$(EXE)
  endif
  
--x264$(EXE): .depend $(OBJCLI) $(CLI_LIBX264)
+-x264$(EXE): $(GENERATED) .depend $(OBJCLI) $(CLI_LIBX264)
 -	$(LD)$@ $(OBJCLI) $(CLI_LIBX264) $(LDFLAGSCLI) $(LDFLAGS)
-+x264$(EXE): .depend $(OBJCLI) $(SONAME)
++x264$(EXE): $(GENERATED) .depend $(OBJCLI) $(SONAME)
 +	$(LD)$@ $(OBJCLI) -L. -lx264 $(LDFLAGSCLI) $(LDFLAGS)
  
- checkasm$(EXE): .depend $(OBJCHK) $(LIBX264)
+ checkasm$(EXE): $(GENERATED) .depend $(OBJCHK) $(LIBX264)
  	$(LD)$@ $(OBJCHK) $(LIBX264) $(LDFLAGS)

x264-snapshot-20130224-2245.tar.bz2 -> x264-snapshot-20130723-2245.tar.bz2 Changed

Build Results
RPM Lint

Refresh

Comments for request 6 0

Request History

marguerite created request over 11 years ago

update version 20130723

marguerite accepted request over 11 years ago

sure