Date: Sun, 9 Apr 2023 08:18:11 GMT From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 2f42218cc66b - main - multimedia/pHash/: Remove expired port: Message-ID: <202304090818.3398IBp2051349@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=2f42218cc66b50c45d5b5828ad0cc8369745c59c commit 2f42218cc66b50c45d5b5828ad0cc8369745c59c Author: Rene Ladan <rene@FreeBSD.org> AuthorDate: 2023-04-09 08:17:38 +0000 Commit: Rene Ladan <rene@FreeBSD.org> CommitDate: 2023-04-09 08:17:59 +0000 multimedia/pHash/: Remove expired port: 2023-04-09 multimedia/pHash: No users left in tree and fails to build with FFmpeg 6.0 --- MOVED | 1 + multimedia/Makefile | 1 - multimedia/pHash/Makefile | 62 ------------- multimedia/pHash/distinfo | 2 - multimedia/pHash/files/patch-configure | 20 ----- multimedia/pHash/files/patch-ffmpeg30 | 139 ----------------------------- multimedia/pHash/files/patch-src_pHash.cpp | 22 ----- multimedia/pHash/pkg-descr | 3 - multimedia/pHash/pkg-plist | 9 -- 9 files changed, 1 insertion(+), 258 deletions(-) diff --git a/MOVED b/MOVED index d58e79fd6d76..54104ca11e51 100644 --- a/MOVED +++ b/MOVED @@ -17889,3 +17889,4 @@ multimedia/transcode||2023-03-31|Has expired: abandoned by upstream and does not security/teleport5|security/teleport|2023-03-31|More recent version than expired teleport port www/anyterm||2023-04-01|Has expired: upstream is dead audio/mousai-devel|audio/mousai|2023-04-06|Updated to the latest stable version +multimedia/pHash||2023-04-09|Has expired: No users left in tree and fails to build with FFmpeg 6.0 diff --git a/multimedia/Makefile b/multimedia/Makefile index 253b592033c1..0c97c4c5ee9f 100644 --- a/multimedia/Makefile +++ b/multimedia/Makefile @@ -282,7 +282,6 @@ SUBDIR += p5-MP4-Info SUBDIR += p5-Net-UPnP SUBDIR += p5-Subtitles - SUBDIR += pHash SUBDIR += peek SUBDIR += phonon SUBDIR += phonon-designerplugin diff --git a/multimedia/pHash/Makefile b/multimedia/pHash/Makefile deleted file mode 100644 index 83f16bb404f1..000000000000 --- a/multimedia/pHash/Makefile +++ /dev/null @@ -1,62 +0,0 @@ -PORTNAME= pHash -PORTVERSION= 0.9.6 -PORTREVISION= 16 -CATEGORIES= multimedia devel -MASTER_SITES= http://phash.org/releases/ \ - http://www.cyberbotx.com/pHash/ - -MAINTAINER= cyberbotx@cyberbotx.com -COMMENT= Open source perceptual hash library -WWW= https://phash.org/ - -LICENSE= GPLv3+ - -DEPRECATED= No users left in tree and fails to build with FFmpeg 6.0 -EXPIRATION_DATE=2023-04-09 - -USES= compiler:c11 gmake libtool pathfix -GNU_CONFIGURE= yes -CONFIGURE_ENV= PTHREAD_LIBS="-lpthread" -INSTALL_TARGET= install-strip -USE_LDCONFIG= yes - -OPTIONS_DEFINE= DEBUG FFTW JPEG OPENMP PNG -OPTIONS_MULTI= HASHING -OPTIONS_MULTI_HASHING= AUDIO IMAGE VIDEO -OPTIONS_DEFAULT= FFTW JPEG PNG AUDIO IMAGE VIDEO -AUDIO_DESC= Enable audio hashing -IMAGE_DESC= Enable image hashing -VIDEO_DESC= Enable video hashing - -DEBUG_CONFIGURE_ENABLE= debug - -FFTW_CONFIGURE_WITH= fftw -FFTW_LIB_DEPENDS= libfftw3.so:math/fftw3 - -JPEG_CONFIGURE_WITH= libjpeg -JPEG_USES= jpeg - -OPENMP_CONFIGURE_ENABLE=openmp - -PNG_CONFIGURE_WITH= libpng -PNG_LIB_DEPENDS= libpng.so:graphics/png - -AUDIO_CONFIGURE_ENABLE= audio-hash -AUDIO_LIB_DEPENDS= libsndfile.so:audio/libsndfile \ - libsamplerate.so:audio/libsamplerate \ - libmpg123.so:audio/mpg123 - -IMAGE_CONFIGURE_ENABLE= image-hash -IMAGE_BUILD_DEPENDS= ${LOCALBASE}/include/CImg.h:graphics/cimg -IMAGE_RUN_DEPENDS= ${LOCALBASE}/include/CImg.h:graphics/cimg - -VIDEO_CONFIGURE_ENABLE= video-hash -VIDEO_BUILD_DEPENDS= ${LOCALBASE}/include/CImg.h:graphics/cimg -VIDEO_RUN_DEPENDS= ${LOCALBASE}/include/CImg.h:graphics/cimg -VIDEO_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg - -post-patch: -# Avoid USES=autoreconf while keeping configure.ac patch for reference - @${TOUCH} -r ${WRKSRC}/aclocal.m4 ${WRKSRC}/configure.ac - -.include <bsd.port.mk> diff --git a/multimedia/pHash/distinfo b/multimedia/pHash/distinfo deleted file mode 100644 index ccda48e78c3e..000000000000 --- a/multimedia/pHash/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (pHash-0.9.6.tar.gz) = 3c8258a014f9c2491fb1153010984606805638a45d00498864968a9a30102935 -SIZE (pHash-0.9.6.tar.gz) = 1315965 diff --git a/multimedia/pHash/files/patch-configure b/multimedia/pHash/files/patch-configure deleted file mode 100644 index 9d869267f69c..000000000000 --- a/multimedia/pHash/files/patch-configure +++ /dev/null @@ -1,20 +0,0 @@ ---- configure.orig 2013-04-23 18:48:24 UTC -+++ configure -@@ -16584,7 +16584,7 @@ if ${ac_cv_lib_fftw3_fftw_plan_dft_r2c_1d+:} false; th - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lfftw3 $LIBS" -+LIBS="-lfftw3 -lfftw3_threads $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -16615,7 +16615,7 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fftw3_fftw_plan_dft_r2c_1d" >&5 - $as_echo "$ac_cv_lib_fftw3_fftw_plan_dft_r2c_1d" >&6; } - if test "x$ac_cv_lib_fftw3_fftw_plan_dft_r2c_1d" = xyes; then : -- CPPFLAGS="$CPPFLAGS -Dcimg_use_fftw3" LIBS="$LIBS -lfftw3" -+ CPPFLAGS="$CPPFLAGS -Dcimg_use_fftw3" LIBS="$LIBS -lfftw3 -lfftw3_threads" - else - if test "x$with_fftw" = "xyes"; then : - as_fn_error $? "FFTW support requested but library not found" "$LINENO" 5 diff --git a/multimedia/pHash/files/patch-ffmpeg30 b/multimedia/pHash/files/patch-ffmpeg30 deleted file mode 100644 index d2e1ba48908b..000000000000 --- a/multimedia/pHash/files/patch-ffmpeg30 +++ /dev/null @@ -1,139 +0,0 @@ ---- configure.orig 2013-04-23 18:48:24 UTC -+++ configure -@@ -16009,9 +16009,9 @@ if test "x$enable_video_hash" != "xno"; - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether FFmpeg is present" >&5 - $as_echo_n "checking whether FFmpeg is present... " >&6; } --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for avcodec_alloc_frame in -lavcodec" >&5 --$as_echo_n "checking for avcodec_alloc_frame in -lavcodec... " >&6; } --if ${ac_cv_lib_avcodec_avcodec_alloc_frame+:} false; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for avcodec_decode_video2 in -lavcodec" >&5 -+$as_echo_n "checking for avcodec_decode_video2 in -lavcodec... " >&6; } -+if ${ac_cv_lib_avcodec_avcodec_decode_video2+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS -@@ -16025,27 +16025,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ - #ifdef __cplusplus - extern "C" - #endif --char avcodec_alloc_frame (); -+char avcodec_decode_video2 (); - int - main () - { --return avcodec_alloc_frame (); -+return avcodec_decode_video2 (); - ; - return 0; - } - _ACEOF - if ac_fn_cxx_try_link "$LINENO"; then : -- ac_cv_lib_avcodec_avcodec_alloc_frame=yes -+ ac_cv_lib_avcodec_avcodec_decode_video2=yes - else -- ac_cv_lib_avcodec_avcodec_alloc_frame=no -+ ac_cv_lib_avcodec_avcodec_decode_video2=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_avcodec_alloc_frame" >&5 --$as_echo "$ac_cv_lib_avcodec_avcodec_alloc_frame" >&6; } --if test "x$ac_cv_lib_avcodec_avcodec_alloc_frame" = xyes; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_avcodec_decode_video2" >&5 -+$as_echo "$ac_cv_lib_avcodec_avcodec_decode_video2" >&6; } -+if test "x$ac_cv_lib_avcodec_avcodec_decode_video2" = xyes; then : - cat >>confdefs.h <<_ACEOF - #define HAVE_LIBAVCODEC 1 - _ACEOF ---- configure.ac.orig 2013-04-23 18:47:49 UTC -+++ configure.ac -@@ -122,7 +122,7 @@ fi]) - AC_DEFUN([AC_CHECK_FFMPEG], - [ - AC_MSG_CHECKING([whether FFmpeg is present]) --AC_CHECK_LIB([avcodec], [avcodec_alloc_frame], [], [AC_MSG_ERROR([ -+AC_CHECK_LIB([avcodec], [avcodec_decode_video2], [], [AC_MSG_ERROR([ - - *** libavcodec not found. - You need FFmpeg. Get it at <http://ffmpeg.org/>])]) ---- src/cimgffmpeg.cpp.orig 2012-11-23 20:58:01 UTC -+++ src/cimgffmpeg.cpp -@@ -39,11 +39,11 @@ void vfinfo_close(VFInfo *vfinfo){ - int ReadFrames(VFInfo *st_info, CImgList<uint8_t> *pFrameList, unsigned int low_index, unsigned int hi_index) - { - //target pixel format -- PixelFormat ffmpeg_pixfmt; -+ AVPixelFormat ffmpeg_pixfmt; - if (st_info->pixelformat == 0) -- ffmpeg_pixfmt = PIX_FMT_GRAY8; -+ ffmpeg_pixfmt = AV_PIX_FMT_GRAY8; - else -- ffmpeg_pixfmt = PIX_FMT_RGB24; -+ ffmpeg_pixfmt = AV_PIX_FMT_RGB24; - - st_info->next_index = low_index; - -@@ -100,12 +100,12 @@ int ReadFrames(VFInfo *st_info, CImgList - AVFrame *pFrame; - - // Allocate video frame -- pFrame=avcodec_alloc_frame(); -+ pFrame=av_frame_alloc(); - if (pFrame==NULL) - return -1; - - // Allocate an AVFrame structure -- AVFrame *pConvertedFrame = avcodec_alloc_frame(); -+ AVFrame *pConvertedFrame = av_frame_alloc(); - if(pConvertedFrame==NULL) - return -1; - -@@ -123,7 +123,7 @@ int ReadFrames(VFInfo *st_info, CImgList - int size = 0; - - -- int channels = ffmpeg_pixfmt == PIX_FMT_GRAY8 ? 1 : 3; -+ int channels = ffmpeg_pixfmt == AV_PIX_FMT_GRAY8 ? 1 : 3; - - AVPacket packet; - int result = 1; -@@ -189,11 +189,11 @@ int ReadFrames(VFInfo *st_info, CImgList - - int NextFrames(VFInfo *st_info, CImgList<uint8_t> *pFrameList) - { -- PixelFormat ffmpeg_pixfmt; -+ AVPixelFormat ffmpeg_pixfmt; - if (st_info->pixelformat == 0) -- ffmpeg_pixfmt = PIX_FMT_GRAY8; -+ ffmpeg_pixfmt = AV_PIX_FMT_GRAY8; - else -- ffmpeg_pixfmt = PIX_FMT_RGB24; -+ ffmpeg_pixfmt = AV_PIX_FMT_RGB24; - - if (st_info->pFormatCtx == NULL) - { -@@ -254,10 +254,10 @@ int NextFrames(VFInfo *st_info, CImgList - AVFrame *pFrame; - - // Allocate video frame -- pFrame=avcodec_alloc_frame(); -+ pFrame=av_frame_alloc(); - - // Allocate an AVFrame structure -- AVFrame *pConvertedFrame = avcodec_alloc_frame(); -+ AVFrame *pConvertedFrame = av_frame_alloc(); - if(pConvertedFrame==NULL){ - return -1; - } -@@ -287,7 +287,7 @@ int NextFrames(VFInfo *st_info, CImgList - break; - if(packet.stream_index == st_info->videoStream) { - -- int channels = ffmpeg_pixfmt == PIX_FMT_GRAY8 ? 1 : 3; -+ int channels = ffmpeg_pixfmt == AV_PIX_FMT_GRAY8 ? 1 : 3; - AVPacket avpkt; - av_init_packet(&avpkt); - avpkt.data = packet.data; diff --git a/multimedia/pHash/files/patch-src_pHash.cpp b/multimedia/pHash/files/patch-src_pHash.cpp deleted file mode 100644 index 5528ff0e505f..000000000000 --- a/multimedia/pHash/files/patch-src_pHash.cpp +++ /dev/null @@ -1,22 +0,0 @@ ---- src/pHash.cpp.orig 2013-04-13 17:23:12 UTC -+++ src/pHash.cpp -@@ -34,14 +34,18 @@ - int ph_num_threads() - { - int numCPU = 1; --#ifdef __GLIBC__ -+#ifdef _SC_NPROCESSORS_ONLN - numCPU = sysconf( _SC_NPROCESSORS_ONLN ); - #else - int mib[2]; - size_t len; - - mib[0] = CTL_HW; -+#ifdef HW_AVAILCPU - mib[1] = HW_AVAILCPU; -+#else -+ mib[1] = HW_NCPU; -+#endif - - sysctl(mib, 2, &numCPU, &len, NULL, 0); - diff --git a/multimedia/pHash/pkg-descr b/multimedia/pHash/pkg-descr deleted file mode 100644 index 92e4e2ee71df..000000000000 --- a/multimedia/pHash/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -pHash is an open source software library released under the GPLv3 license that -implements several perceptual hashing algorithms, and provides a C-like API to -use those functions in your own programs. pHash itself is written in C++. diff --git a/multimedia/pHash/pkg-plist b/multimedia/pHash/pkg-plist deleted file mode 100644 index 13814d437c3a..000000000000 --- a/multimedia/pHash/pkg-plist +++ /dev/null @@ -1,9 +0,0 @@ -include/audiophash.h -include/pHash-config.h -include/pHash.h -include/ph_fft.h -lib/libpHash.a -lib/libpHash.so -lib/libpHash.so.0 -lib/libpHash.so.0.0.0 -libdata/pkgconfig/pHash.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304090818.3398IBp2051349>