--- /dev/null
+Index: zvbi-0.2.35/test/test-dvb_mux.cc
+===================================================================
+--- zvbi-0.2.35.orig/test/test-dvb_mux.cc
++++ zvbi-0.2.35/test/test-dvb_mux.cc
+@@ -137,7 +137,7 @@ is_good_service (vbi_service_set servi
+ static const vbi_service_set
+ all_services [] = {
+ 0,
+- -1,
++ (vbi_service_set)-1,
+ VBI_SLICED_2xCAPTION_525,
+ VBI_SLICED_CAPTION_525,
+ VBI_SLICED_CAPTION_525_F1,
+@@ -3237,7 +3237,7 @@ static void
+ test_dvb_mux_cor_pts (void)
+ {
+ static const int64_t ptss [] = {
+- 0x8000000000000000ll, -1, 0, 0x7FFFFFFFFFFFFFFFll,
++ (int64_t)0x8000000000000000ll, -1, 0, 0x7FFFFFFFFFFFFFFFll,
+ };
+ DVBPESMuxTest mx;
+ unsigned int i;