!1 update patches

Merge pull request !1 from putao66/master
This commit is contained in:
openeuler-ci-bot 2020-01-16 17:47:23 +08:00 committed by Gitee
commit e32aa534b5
3 changed files with 6 additions and 30 deletions

View File

@ -1,6 +1,6 @@
We now need to explicitly link to libraries that we use because we can no We now need to explicitly link to libraries that we use because we can no
longer depend on our dependencies to pull them in for us. See longer depend on our dependencies to pull them in for us.
http://fedoraproject.org/wiki/UnderstandingDSOLinkChange https://code.foxkit.us/adelie/aports-old/blob/50de7d785d5500a14ed00fa12e483e8ceaf4f06a/main/libdv/libdv-1.0.0-dso-linking.patch
--- libdv-1.0.0/playdv/#Makefile.am~ 2010-02-15 14:49:06.000000000 -0500 --- libdv-1.0.0/playdv/#Makefile.am~ 2010-02-15 14:49:06.000000000 -0500
+++ libdv-1.0.0/playdv/Makefile.am 2010-02-15 14:49:06.000000000 -0500 +++ libdv-1.0.0/playdv/Makefile.am 2010-02-15 14:49:06.000000000 -0500
@ -10,13 +10,3 @@ http://fedoraproject.org/wiki/UnderstandingDSOLinkChange
playdv_SOURCES= playdv.c display.c display.h oss.c playdv_SOURCES= playdv.c display.c display.h oss.c
-playdv_LDADD= $(SDL_LIBS) $(GTK_LIBS) $(XV_LIB) ../libdv/libdv.la $(POPT_LIB) -playdv_LDADD= $(SDL_LIBS) $(GTK_LIBS) $(XV_LIB) ../libdv/libdv.la $(POPT_LIB)
+playdv_LDADD= $(SDL_LIBS) $(GTK_LIBS) $(XV_LIB) ../libdv/libdv.la $(POPT_LIB) -lX11 -lXext +playdv_LDADD= $(SDL_LIBS) $(GTK_LIBS) $(XV_LIB) ../libdv/libdv.la $(POPT_LIB) -lX11 -lXext
--- libdv-1.0.0/Makefile.orig.am 2006-08-06 22:10:42.000000000 +0200
+++ libdv-1.0.0/Makefile.am 2016-08-01 12:31:11.622234099 +0200
@@ -5,6 +5,7 @@
endif
SUBDIRS = libdv encodedv $(gtk_subdirs)
+ACLOCAL_AMFLAGS = -I m4
AUX_DIST = $(ac_aux_dir)/config.guess \
$(ac_aux_dir)/config.sub \

View File

@ -1,22 +1,5 @@
--- libdv-1.0.0/configure.ac.orig 2007-01-19 15:48:43.000000000 -0500 --- libdv-1.0.0/configure.ac.orig 2007-01-19 15:48:43.000000000 -0500
+++ libdv-1.0.0/configure.ac 2007-01-19 15:50:08.000000000 -0500 +++ libdv-1.0.0/configure.ac 2007-01-19 15:50:08.000000000 -0500
@@ -1,12 +1,14 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(libdv/parse.c)
+AC_INIT(libdv, 1.0.0)
+AC_CONFIG_SRCDIR(libdv/parse.c)
+AC_CONFIG_MACRO_DIRS([m4])
dnl AC_CONFIG_AUX_DIR(config)
AM_CONFIG_HEADER(config.h)
RPM_RELEASE=1
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(libdv, 1.0.0)
+AM_INIT_AUTOMAKE
AM_MAINTAINER_MODE
AC_LIBTOOL_PICMODE(no)
@@ -164,7 +164,7 @@ @@ -164,7 +164,7 @@
dnl Checks for libraries. dnl Checks for libraries.
have_gtk="false" have_gtk="false"

View File

@ -1,6 +1,6 @@
Name: libdv Name: libdv
Version: 1.0.0 Version: 1.0.0
Release: 29 Release: 30
Summary: The Quasar DV Codec Summary: The Quasar DV Codec
License: LGPLv2+ License: LGPLv2+
URL: http://libdv.sourceforge.net/ URL: http://libdv.sourceforge.net/
@ -71,5 +71,8 @@ autoreconf -vif
%{_mandir}/man1/*.1* %{_mandir}/man1/*.1*
%changelog %changelog
* Thu Jan 16 2020 liujing <liujing144@huawei.com> - 1.0.0-30
- update patches from https://code.foxkit.us/adelie/aports-old/blob/50de7d785d5500a14ed00fa12e483e8ceaf4f06a/main/libdv
* Thu Oct 24 2019 yanzhihua <yanzhihua4@huawei.com> - 1.0.0-29 * Thu Oct 24 2019 yanzhihua <yanzhihua4@huawei.com> - 1.0.0-29
- Package init - Package init