CVS commit: pkgsrc/www/cherokee

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Apr 23 15:46:01 UTC 2020

Modified Files:
        pkgsrc/www/cherokee: Makefile PLIST distinfo options.mk
Added Files:
        pkgsrc/www/cherokee/patches: patch-cherokee_handler__streaming.c

Log Message:
cherokee: Switch to ffmpeg4. Note that the ffmpeg option was broken


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/www/cherokee/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/cherokee/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/cherokee/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/cherokee/options.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/cherokee/patches/patch-cherokee_handler__streaming.c

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

Modified files:

Index: pkgsrc/www/cherokee/Makefile
diff -u pkgsrc/www/cherokee/Makefile:1.43 pkgsrc/www/cherokee/Makefile:1.44
--- pkgsrc/www/cherokee/Makefile:1.43   Sat Jan 18 21:51:05 2020
+++ pkgsrc/www/cherokee/Makefile        Thu Apr 23 15:46:01 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2020/01/18 21:51:05 jperkin Exp $
+# $NetBSD: Makefile,v 1.44 2020/04/23 15:46:01 nia Exp $
 
 DISTNAME=      cherokee-1.2.101
-PKGREVISION=   14
+PKGREVISION=   15
 CATEGORIES=    www
 MASTER_SITES=  http://www.cherokee-project.com/download/1.2/${PKGVERSION_NOREV}/
 

Index: pkgsrc/www/cherokee/PLIST
diff -u pkgsrc/www/cherokee/PLIST:1.6 pkgsrc/www/cherokee/PLIST:1.7
--- pkgsrc/www/cherokee/PLIST:1.6       Mon Jan  1 22:30:02 2018
+++ pkgsrc/www/cherokee/PLIST   Thu Apr 23 15:46:01 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2018/01/01 22:30:02 rillig Exp $
+@comment $NetBSD: PLIST,v 1.7 2020/04/23 15:46:01 nia Exp $
 bin/CTK-run
 bin/cget
 bin/cherokee-admin-launcher
@@ -99,6 +99,7 @@ lib/cherokee/libplugin_scgi.la
 lib/cherokee/libplugin_secdownload.la
 lib/cherokee/libplugin_server_info.la
 lib/cherokee/libplugin_ssi.la
+${PLIST.ffmpeg}lib/cherokee/libplugin_streaming.la
 lib/cherokee/libplugin_target_ip.la
 lib/cherokee/libplugin_tls.la
 lib/cherokee/libplugin_url_arg.la

Index: pkgsrc/www/cherokee/distinfo
diff -u pkgsrc/www/cherokee/distinfo:1.8 pkgsrc/www/cherokee/distinfo:1.9
--- pkgsrc/www/cherokee/distinfo:1.8    Wed Apr 15 22:38:18 2020
+++ pkgsrc/www/cherokee/distinfo        Thu Apr 23 15:46:01 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2020/04/15 22:38:18 joerg Exp $
+$NetBSD: distinfo,v 1.9 2020/04/23 15:46:01 nia Exp $
 
 SHA1 (cherokee-1.2.101.tar.gz) = b27f149c7d7111207ac8c3cd8a4856c05490d136
 RMD160 (cherokee-1.2.101.tar.gz) = dd3dedc352ba17bdcefd8e200143b8ffa19ad035
@@ -10,4 +10,5 @@ SHA1 (patch-cherokee_cryptor__libssl__dh
 SHA1 (patch-cherokee_cryptor__libssl__dh__2048.c) = 46541cfd1ab8dfcc14a14aa3240d2047dd044aaa
 SHA1 (patch-cherokee_cryptor__libssl__dh__4096.c) = 8aa7c90d05fcefba59243a8b9671fca3f74f73d3
 SHA1 (patch-cherokee_cryptor__libssl__dh__512.c) = 8c0c43942b7fa2485e241f376c9d542cb9b506b9
+SHA1 (patch-cherokee_handler__streaming.c) = 0cc14d5de031b69146939114f28981f522e15174
 SHA1 (patch-configure) = 58a25088320863dd00f4c7d4f050e1c163dbe6f3

Index: pkgsrc/www/cherokee/options.mk
diff -u pkgsrc/www/cherokee/options.mk:1.2 pkgsrc/www/cherokee/options.mk:1.3
--- pkgsrc/www/cherokee/options.mk:1.2  Mon Aug 11 23:09:46 2014
+++ pkgsrc/www/cherokee/options.mk      Thu Apr 23 15:46:01 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2014/08/11 23:09:46 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2020/04/23 15:46:01 nia Exp $
 #
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.cherokee
@@ -7,7 +7,7 @@ PKG_SUGGESTED_OPTIONS+=         inet6 pam ssl t
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=   geoip ldap mysql pam ssl
+PLIST_VARS+=   ffmpeg geoip ldap mysql pam ssl
 
 ###
 ### Threading support.
@@ -79,7 +79,7 @@ CONFIGURE_ARGS+=      --without-geoip
 .if !empty(PKG_OPTIONS:Mffmpeg)
 PLIST.ffmpeg=          yes
 CONFIGURE_ARGS+=       --with-ffmpeg=${BUILDLINK_PREFIX.ffmpeg}
-.include "../../multimedia/ffmpeg1/buildlink3.mk"
+.include "../../multimedia/ffmpeg3/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --without-ffmpeg
 .endif

Added files:

Index: pkgsrc/www/cherokee/patches/patch-cherokee_handler__streaming.c
diff -u /dev/null pkgsrc/www/cherokee/patches/patch-cherokee_handler__streaming.c:1.1
--- /dev/null   Thu Apr 23 15:46:01 2020
+++ pkgsrc/www/cherokee/patches/patch-cherokee_handler__streaming.c     Thu Apr 23 15:46:01 2020
@@ -0,0 +1,50 @@
+$NetBSD: patch-cherokee_handler__streaming.c,v 1.1 2020/04/23 15:46:01 nia Exp $
+
+Fix build with ffmpeg4.
+
+--- cherokee/handler_streaming.c.orig  2011-10-12 18:07:44.000000000 +0000
++++ cherokee/handler_streaming.c
+@@ -111,7 +111,7 @@ cherokee_handler_streaming_free (cheroke
+       }
+ 
+       if (hdl->avformat != NULL) {
+-              av_close_input_file (hdl->avformat);
++              avformat_close_input (&hdl->avformat);
+       }
+ 
+       cherokee_buffer_mrproper (&hdl->local_file);
+@@ -312,14 +312,14 @@ open_media_file (cherokee_handler_stream
+ 
+       /* Open the media stream
+        */
+-      re = av_open_input_file (&hdl->avformat, hdl->local_file.buf, NULL, 0, NULL);
++      re = avformat_open_input (&hdl->avformat, hdl->local_file.buf, NULL, NULL);
+       if (re != 0) {
+               goto error;
+       }
+ 
+       /* Read the info
+        */
+-      re = av_find_stream_info (hdl->avformat);
++      re = avformat_find_stream_info (hdl->avformat, NULL);
+       if (re < 0) {
+               goto error;
+       }
+@@ -327,7 +327,7 @@ open_media_file (cherokee_handler_stream
+       return ret_ok;
+ error:
+       if (hdl->avformat != NULL) {
+-              av_close_input_file (hdl->avformat);
++              avformat_close_input (&hdl->avformat);
+               hdl->avformat = NULL;
+       }
+ 
+@@ -380,7 +380,7 @@ set_auto_rate (cherokee_handler_streamin
+       if (likely (secs > 0)) {
+               long tmp;
+ 
+-              tmp = (hdl->avformat->file_size / secs);
++              tmp = (hdl->handler_file->info->st_size / secs);
+               if (tmp > rate) {
+                       rate = tmp;
+                       TRACE(ENTRIES, "New rate: %d bytes/s\n", rate);