On Sun, Nov 02, 2014 at 10:31:14AM +0000, Stuart Henderson wrote:
> On 2014/11/02 05:18, Brad Smith wrote:
> > On 02/11/14 5:08 AM, Stuart Henderson wrote:
> > >On 2014/11/02 04:21, Brad Smith wrote:
> > >>Here is an update to x265 1.4.
> > >>
> > >>OK?
> > >
> > >Personally I'd do something like this,
> > >
> > >DISTNAME= x265-1.4
> > >DISTFILES= ${DISTNAME}{1.4}${EXTRACT_SUFX}
> > >(and get rid of DIST_SUBDIR/regen distinfo)
> > >
> > >even if only so that "cd /usr/ports/*/x265" works without picking up the
> > >directory in distfiles. But I'm OK either way.
> >
> > I don't like the naming either but I don't want to have to take
> > the upstream dist file and rename it and host it elsewhere. What
> > is the point of the {1.4} there in DISTFILES? I'll speak to upstream
> > and see if I can get them to prefix the file name with x265-.
>
> That uses ftp -o to rename the output file, so it fetches from 1.4.tar.bz2
> and writes to /usr/ports/distfiles/x265-1.4.tar.bz2. Alternatively use a
> variable and do e.g.
Updated using your suggestion as a workaround.
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/multimedia/x265/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- Makefile 9 Oct 2014 02:23:10 -0000 1.4
+++ Makefile 2 Nov 2014 10:39:19 -0000
@@ -6,13 +6,14 @@ BROKEN-mips64 = undefined reference to
BROKEN-mips64el = undefined reference to `__sync_val_compare_and_swap_8'
BROKEN-powerpc = undefined reference to `__sync_val_compare_and_swap_8'
-DISTNAME= 1.3
-PKGNAME= x265-${DISTNAME}
+VER= 1.4
+DISTNAME= x265-${VER}
+DISTFILES= ${DISTNAME}{${VER}}${EXTRACT_SUFX}
CATEGORIES= multimedia
MASTER_SITES= https://bitbucket.org/multicoreware/x265/get/
EXTRACT_SUFX= .tar.bz2
-SHARED_LIBS= x265 0.0
+SHARED_LIBS= x265 1.0
HOMEPAGE= http://x265.org/
@@ -24,8 +25,7 @@ PERMIT_PACKAGE_FTP= Yes
WANTLIB= c m pthread stdc++
-DIST_SUBDIR= x265
-WRKDIST= ${WRKDIR}/multicoreware-x265-c1e4fc0162c1
+WRKDIST= ${WRKDIR}/multicoreware-x265-5e604833c5aa
WRKSRC= ${WRKDIST}/source
MODULES= devel/cmake \
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/multimedia/x265/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo 4 Sep 2014 17:11:45 -0000 1.2
+++ distinfo 2 Nov 2014 10:39:30 -0000
@@ -1,2 +1,2 @@
-SHA256 (x265/1.3.tar.bz2) = OAcJCpm8NRiU1Y6wN9tPFIey26NInrLDirQ91rfJsJ0=
-SIZE (x265/1.3.tar.bz2) = 562401
+SHA256 (x265-1.4.tar.bz2) = 6BjKzWqWPUmBPb5sBBiIMRojfalYluYEtMkbLd+sg6U=
+SIZE (x265-1.4.tar.bz2) = 561381
Index: patches/patch-source_CMakeLists_txt
===================================================================
RCS file: patches/patch-source_CMakeLists_txt
diff -N patches/patch-source_CMakeLists_txt
--- patches/patch-source_CMakeLists_txt 5 Sep 2014 15:29:41 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-source_CMakeLists_txt,v 1.2 2014/09/05 15:29:41 brad Exp $
-
-https://bitbucket.org/multicoreware/x265/commits/139d6b2a1b19
-
---- source/CMakeLists.txt.orig Thu Aug 21 17:49:02 2014
-+++ source/CMakeLists.txt Thu Sep 4 13:07:00 2014
-@@ -55,9 +55,10 @@ endif()
-
- if(UNIX)
- SET(PLATFORM_LIBS pthread)
-- if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-+ find_library(LIBRT rt)
-+ if(LIBRT)
- SET(PLATFORM_LIBS ${PLATFORM_LIBS} rt)
-- endif(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-+ endif()
- endif(UNIX)
-
- # Compiler detection
Index: patches/patch-source_common_version_cpp
===================================================================
RCS file: patches/patch-source_common_version_cpp
diff -N patches/patch-source_common_version_cpp
--- patches/patch-source_common_version_cpp 5 Sep 2014 15:29:41 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-source_common_version_cpp,v 1.2 2014/09/05 15:29:41 brad Exp $
-
-https://bitbucket.org/multicoreware/x265/commits/821c2eef4d52
-
---- source/common/version.cpp.orig Thu Aug 21 17:49:02 2014
-+++ source/common/version.cpp Sun Aug 31 12:44:20 2014
-@@ -63,6 +63,8 @@
- #define NVM_ONOS "[Cygwin]"
- #elif __APPLE__
- #define NVM_ONOS "[Mac OS X]"
-+#elif __OpenBSD__
-+#define NVM_ONOS "[OpenBSD]"
- #else
- #define NVM_ONOS "[Unk-OS]"
- #endif
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
