vlc-3-git: Switch to GIT_REPO

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: vlc-3-git: Switch to GIT_REPO
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Mon, 05 Mar 2018 10:37:34 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Mon Mar 5 11:37:34 2018 +0100
Changeset:	dfae5c3d66afee855439cbbdcb11ab4e15210244

Modified Files:
	vlc-3-git/Makefile
	vlc-3-git/distinfo
Removed Files:
	vlc-3-git/patches/patch-compat_Makefile.am
	vlc-3-git/patches/patch-compat_Makefile.in
	vlc-3-git/patches/patch-include_vlc__common.h
	vlc-3-git/patches/patch-include_vlc__fixups.h

Log Message:
vlc-3-git: Switch to GIT_REPO

Drop local patches.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=dfae5c3d66afee855439cbbdcb11ab4e15210244

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 vlc-3-git/Makefile                            |  14 ++-
 vlc-3-git/distinfo                            |   4 -
 vlc-3-git/patches/patch-compat_Makefile.am    |  14 ---
 vlc-3-git/patches/patch-compat_Makefile.in    | 123 --------------------------
 vlc-3-git/patches/patch-include_vlc__common.h |  40 ---------
 vlc-3-git/patches/patch-include_vlc__fixups.h |  44 ---------
 6 files changed, 10 insertions(+), 229 deletions(-)

diffs:
diff --git a/vlc-3-git/Makefile b/vlc-3-git/Makefile
index 5e5b1f748c..103b654ef0 100644
--- a/vlc-3-git/Makefile
+++ b/vlc-3-git/Makefile
@@ -2,9 +2,10 @@
 
 DISTNAME=		vlc-${VLC_VERSION}
 CATEGORIES=		multimedia
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vlc/}
-MASTER_SITES+=		http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
-EXTRACT_SUFX=		.tar.xz
+#MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vlc/}
+#MASTER_SITES+=		http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
+#EXTRACT_SUFX=		.tar.xz
+GIT_REPO=		https://git.videolan.org/git/vlc/vlc-3.0.git
 
 VLC_VERSION=		3.0.0
 
@@ -16,7 +17,7 @@ LICENSE=		gnu-gpl-v2
 CONFLICTS=		vlc07-[0-9]* vlc08-[0-9]*
 
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake perl pkg-config
+USE_TOOLS+=		gmake perl pkg-config autoreconf autoconf automake bison autopoint
 
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
@@ -140,6 +141,11 @@ SUBST_MESSAGE.fnt=	Fixing hardcoded font paths.
 CHECK_WRKREF_SKIP=	lib/libvlccore.a \
 			lib/libvlccore.so*
 
+pre-configure:
+	${RUN} cd ${WRKSRC} && ${SH} ./bootstrap
+
+.include "../../wip/mk/git-package.mk"
+
 .include "../../audio/fluidsynth/buildlink3.mk"
 .include "../../audio/flac/buildlink3.mk"
 .include "../../multimedia/libkate/buildlink3.mk"
diff --git a/vlc-3-git/distinfo b/vlc-3-git/distinfo
index 9d4ba0031e..9f745ef1a4 100644
--- a/vlc-3-git/distinfo
+++ b/vlc-3-git/distinfo
@@ -4,7 +4,3 @@ SHA1 (vlc-3.0.0.tar.xz) = 50610841b060321242793cf6ad3d58759dc5973b
 RMD160 (vlc-3.0.0.tar.xz) = c0ad23fdf03ae5c9524ed05c7bc0d63745587287
 SHA512 (vlc-3.0.0.tar.xz) = 9bdc64e16ddd2e8d2693179f2fcac8462d7defff186262a049ba325ef00882fbd75a9d323b506ba06876a8168fd5e90319837c8dcd136b206161e67748c2a9f7
 Size (vlc-3.0.0.tar.xz) = 25191148 bytes
-SHA1 (patch-compat_Makefile.am) = 8a5f9c82a748542423172a3a32daefd386ae815d
-SHA1 (patch-compat_Makefile.in) = 2f171749c89443d7352a11c3a59cd2a37eb3df0d
-SHA1 (patch-include_vlc__common.h) = eaa22a53ffa93fbd56d070ef2da22beda9516d9b
-SHA1 (patch-include_vlc__fixups.h) = 6b823f6dde367cb0f7e54022c1d5b626067bbed6
diff --git a/vlc-3-git/patches/patch-compat_Makefile.am b/vlc-3-git/patches/patch-compat_Makefile.am
deleted file mode 100644
index fe3efd210e..0000000000
--- a/vlc-3-git/patches/patch-compat_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
---- compat/Makefile.am.orig	2017-11-24 15:29:17.000000000 +0000
-+++ compat/Makefile.am
-@@ -1,7 +1,7 @@
--pkglib_LTLIBRARIES = libcompat.la
-+noinst_LTLIBRARIES = libcompat.la
- libcompat_la_SOURCES = dummy.c
- libcompat_la_LIBADD = $(LTLIBOBJS) $(LIBRT)
--libcompat_la_LDFLAGS = -no-undefined -static
-+libcompat_la_LDFLAGS = -no-undefined
- 
- BUILT_SOURCES = dummy.c
- CLEANFILES = dummy.c
diff --git a/vlc-3-git/patches/patch-compat_Makefile.in b/vlc-3-git/patches/patch-compat_Makefile.in
deleted file mode 100644
index 689eece39b..0000000000
--- a/vlc-3-git/patches/patch-compat_Makefile.in
+++ /dev/null
@@ -1,123 +0,0 @@
-$NetBSD$
-
---- compat/Makefile.in.orig	2018-02-20 03:25:52.852110360 +0000
-+++ compat/Makefile.in
-@@ -140,7 +140,7 @@ am__uninstall_files_from_dir = { \
-          $(am__cd) "$$dir" && rm -f $$files; }; \
-   }
- am__installdirs = "$(DESTDIR)$(pkglibdir)"
--LTLIBRARIES = $(pkglib_LTLIBRARIES)
-+LTLIBRARIES = $(noinst_LTLIBRARIES)
- am__DEPENDENCIES_1 =
- libcompat_la_DEPENDENCIES = $(LTLIBOBJS) $(am__DEPENDENCIES_1)
- am_libcompat_la_OBJECTS = dummy.lo
-@@ -1204,10 +1204,10 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- vlcdatadir = @vlcdatadir@
- vlclibdir = @vlclibdir@
--pkglib_LTLIBRARIES = libcompat.la
-+noinst_LTLIBRARIES = libcompat.la
- libcompat_la_SOURCES = dummy.c
- libcompat_la_LIBADD = $(LTLIBOBJS) $(LIBRT)
--libcompat_la_LDFLAGS = -no-undefined -static
-+libcompat_la_LDFLAGS = -no-undefined
- BUILT_SOURCES = dummy.c
- CLEANFILES = dummy.c
- AUTOMAKE_OPTIONS = subdir-objects
-@@ -1249,44 +1249,6 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(am__aclocal_m4_deps):
- 
--install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
--	@$(NORMAL_INSTALL)
--	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
--	list2=; for p in $$list; do \
--	  if test -f $$p; then \
--	    list2="$$list2 $$p"; \
--	  else :; fi; \
--	done; \
--	test -z "$$list2" || { \
--	  echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \
--	  $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \
--	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
--	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
--	}
--
--uninstall-pkglibLTLIBRARIES:
--	@$(NORMAL_UNINSTALL)
--	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
--	for p in $$list; do \
--	  $(am__strip_dir) \
--	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
--	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
--	done
--
--clean-pkglibLTLIBRARIES:
--	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
--	@list='$(pkglib_LTLIBRARIES)'; \
--	locs=`for p in $$list; do echo $$p; done | \
--	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
--	      sort -u`; \
--	test -z "$$locs" || { \
--	  echo rm -f $${locs}; \
--	  rm -f $${locs}; \
--	}
--
--libcompat.la: $(libcompat_la_OBJECTS) $(libcompat_la_DEPENDENCIES) $(EXTRA_libcompat_la_DEPENDENCIES) 
--	$(AM_V_CCLD)$(libcompat_la_LINK) -rpath $(pkglibdir) $(libcompat_la_OBJECTS) $(libcompat_la_LIBADD) $(LIBS)
--
- clean-checkPROGRAMS:
- 	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
- 	echo " rm -f" $$list; \
-@@ -1308,6 +1270,9 @@ test_strnstr$(EXEEXT): $(test_strnstr_OB
- 	@rm -f test_strnstr$(EXEEXT)
- 	$(AM_V_CCLD)$(LINK) $(test_strnstr_OBJECTS) $(test_strnstr_LDADD) $(LIBS)
- 
-+libcompat.la: $(libcompat_la_OBJECTS) $(libcompat_la_DEPENDENCIES) $(EXTRA_libcompat_la_DEPENDENCIES)
-+	 $(AM_V_CCLD)$(libcompat_la_LINK)  $(libcompat_la_OBJECTS) $(libcompat_la_LIBADD) $(LIBS)
-+
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
- 	-rm -f test/*.$(OBJEXT)
-@@ -1646,9 +1611,6 @@ check: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) check-am
- all-am: Makefile $(LTLIBRARIES)
- installdirs:
--	for dir in "$(DESTDIR)$(pkglibdir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
--	done
- install: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) install-am
- install-exec: install-exec-am
-@@ -1716,7 +1678,7 @@ install-dvi: install-dvi-am
- 
- install-dvi-am:
- 
--install-exec-am: install-pkglibLTLIBRARIES
-+install-exec-am:
- 
- install-html: install-html-am
- 
-@@ -1762,19 +1724,18 @@ uninstall-am: uninstall-pkglibLTLIBRARIE
- 
- .PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
- 	clean-checkPROGRAMS clean-generic clean-libtool \
--	clean-pkglibLTLIBRARIES cscopelist-am ctags ctags-am distclean \
-+	clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \
- 	distclean-compile distclean-generic distclean-libtool \
- 	distclean-tags distdir dvi dvi-am html html-am info info-am \
- 	install install-am install-data install-data-am install-dvi \
- 	install-dvi-am install-exec install-exec-am install-html \
- 	install-html-am install-info install-info-am install-man \
--	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-+	install-pdf install-pdf-am \
- 	install-ps install-ps-am install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	recheck tags tags-am uninstall uninstall-am \
--	uninstall-pkglibLTLIBRARIES
-+	recheck tags tags-am uninstall uninstall-am
- 
- .PRECIOUS: Makefile
- 
diff --git a/vlc-3-git/patches/patch-include_vlc__common.h b/vlc-3-git/patches/patch-include_vlc__common.h
deleted file mode 100644
index fb4b41345e..0000000000
--- a/vlc-3-git/patches/patch-include_vlc__common.h
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD$
-
---- include/vlc_common.h.orig	2017-12-21 09:51:16.000000000 +0000
-+++ include/vlc_common.h
-@@ -556,6 +556,8 @@ static inline unsigned (ctz)(unsigned x)
- #endif
- }
- 
-+#ifndef __NetBSD__
-+
- /** Bit weight */
- VLC_USED
- static inline unsigned (popcount)(unsigned x)
-@@ -590,6 +592,8 @@ static inline int (popcountll)(unsigned 
- #endif
- }
- 
-+#endif
-+
- VLC_USED
- static inline unsigned (parity)(unsigned x)
- {
-@@ -602,6 +606,8 @@ static inline unsigned (parity)(unsigned
- #endif
- }
- 
-+#ifndef __NetBSD__
-+
- /** Byte swap (16 bits) */
- VLC_USED
- static inline uint16_t (bswap16)(uint16_t x)
-@@ -650,6 +656,8 @@ static inline uint64_t (bswap64)(uint64_
- #endif
- }
- 
-+#endif
-+
- /* Integer overflow */
- static inline bool uadd_overflow(unsigned a, unsigned b, unsigned *res)
- {
diff --git a/vlc-3-git/patches/patch-include_vlc__fixups.h b/vlc-3-git/patches/patch-include_vlc__fixups.h
deleted file mode 100644
index 6eec757858..0000000000
--- a/vlc-3-git/patches/patch-include_vlc__fixups.h
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
---- include/vlc_fixups.h.orig	2018-01-08 12:11:47.000000000 +0000
-+++ include/vlc_fixups.h
-@@ -320,16 +320,28 @@ void *aligned_alloc(size_t, size_t);
- 
- /* locale.h */
- #ifndef HAVE_USELOCALE
-+#ifdef __NetBSD__
-+#include <sys/param.h>
-+#if __NetBSD_Version__ >= 699002300
-+/* NetBSD-current has locale_t but no uselocale */
-+#define NetBSD_LOCALE_HACK
-+#endif
-+#endif
-+#ifdef NetBSD_LOCALE_HACK
-+#include <locale.h>
-+#else
- #define LC_ALL_MASK      0
- #define LC_NUMERIC_MASK  0
- #define LC_MESSAGES_MASK 0
- #define LC_GLOBAL_LOCALE ((locale_t)(uintptr_t)1)
- typedef void *locale_t;
-+#endif
- static inline locale_t uselocale(locale_t loc)
- {
-     (void)loc;
-     return NULL;
- }
-+#ifndef NetBSD_LOCALE_HACK
- static inline void freelocale(locale_t loc)
- {
-     (void)loc;
-@@ -340,8 +352,9 @@ static inline locale_t newlocale(int mas
-     return NULL;
- }
- #endif
-+#endif
- 
--#if !defined (HAVE_STATIC_ASSERT) && !defined(__cpp_static_assert)
-+#if !defined (HAVE_STATIC_ASSERT) && !defined(__cpp_static_assert) && !defined(static_assert)
- # define STATIC_ASSERT_CONCAT_(a, b) a##b
- # define STATIC_ASSERT_CONCAT(a, b) STATIC_ASSERT_CONCAT_(a, b)
- # define _Static_assert(x, s) extern char STATIC_ASSERT_CONCAT(static_assert_, __LINE__)[sizeof(struct { unsigned:-!(x); })]
Prev by Date: mk-scm-tests: clean up code
Next by Date: vlc-git: Drop local patches
Previous by Thread: mk-scm-tests: clean up code
Next by Thread: gnucash-devel: stop installing another Makefile
Indexes:
Home | Main Index | Thread Index | Old Index